Module Name: src Committed By: uebayasi Date: Tue Nov 16 02:47:40 UTC 2010
Modified Files: src/sys/arch/mips/mips [uebayasi-xip]: bus_dma.c Log Message: Sync with HEAD. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/arch/mips/mips/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/mips/mips/bus_dma.c diff -u src/sys/arch/mips/mips/bus_dma.c:1.23 src/sys/arch/mips/mips/bus_dma.c:1.23.2.1 --- src/sys/arch/mips/mips/bus_dma.c:1.23 Mon Dec 14 00:46:05 2009 +++ src/sys/arch/mips/mips/bus_dma.c Tue Nov 16 02:47:40 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.23 2009/12/14 00:46:05 matt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.23.2.1 2010/11/16 02:47:40 uebayasi Exp $ */ /*- * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.23 2009/12/14 00:46:05 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.23.2.1 2010/11/16 02:47:40 uebayasi Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -42,7 +42,7 @@ #include <sys/proc.h> #include <sys/mbuf.h> -#include <uvm/uvm_extern.h> +#include <uvm/uvm.h> #include <mips/cache.h> #ifdef _LP64