Merge http://gkernel.bkbits.net/alpha-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge http://gkernel.bkbits.net/alpha-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
94dc90de · Linus Torvalds · e18fad25 · 6dc89ff4 · 94dc90de · 94dc90de
Commit 94dc90de authored Feb 11, 2002 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

arch/alpha/kernel/srm_env.c arch/alpha/kernel/srm_env.c +1 -0

include/linux/dcache.h include/linux/dcache.h +1 -0

No files found.
--- a/arch/alpha/kernel/srm_env.c
+++ b/arch/alpha/kernel/srm_env.c
@@ -43,6 +43,7 @@
 #include <linux/proc_fs.h>
 #include <asm/console.h>
 #include <asm/uaccess.h>
+#include <asm/machvec.h>
 #define DIRNAME		"srm_environment"	/* Subdir in /proc/	*/
 #define VERSION		"0.0.2"			/* Module version	*/

--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -5,6 +5,7 @@
 #include <asm/atomic.h>
 #include <linux/mount.h>
+#include <asm/page.h>			/* for BUG() */
 /*
 * linux/include/linux/dcache.h