Module Name: src Committed By: uebayasi Date: Tue Nov 16 02:47:24 UTC 2010
Modified Files: src/sys/arch/m68k/m68k [uebayasi-xip]: bus_dma.c Log Message: Sync with HEAD. To generate a diff of this commit: cvs rdiff -u -r1.29.18.1 -r1.29.18.2 src/sys/arch/m68k/m68k/bus_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/m68k/m68k/bus_dma.c diff -u src/sys/arch/m68k/m68k/bus_dma.c:1.29.18.1 src/sys/arch/m68k/m68k/bus_dma.c:1.29.18.2 --- src/sys/arch/m68k/m68k/bus_dma.c:1.29.18.1 Tue Aug 17 06:44:47 2010 +++ src/sys/arch/m68k/m68k/bus_dma.c Tue Nov 16 02:47:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.29.18.1 2010/08/17 06:44:47 uebayasi Exp $ */ +/* $NetBSD: bus_dma.c,v 1.29.18.2 2010/11/16 02:47:24 uebayasi Exp $ */ /* * This file was taken from from alpha/common/bus_dma.c @@ -41,7 +41,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.29.18.1 2010/08/17 06:44:47 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.29.18.2 2010/11/16 02:47:24 uebayasi Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,7 +51,7 @@ #include <sys/proc.h> #include <sys/mbuf.h> -#include <uvm/uvm_extern.h> +#include <uvm/uvm.h> #include <machine/cpu.h>