Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-input

Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-input
f7116f8f · Patrick Mochel · 56fd2e11 · 68239661 · f7116f8f · f7116f8f
Commit f7116f8f authored Aug 26, 2002 by Patrick Mochel
Expand all Show whitespace changes
Inline Side-by-side

Showing with 230 additions and 151 deletions

arch/i386/defconfig arch/i386/defconfig +229 -151

fs/aio.c fs/aio.c +1 -0

No files found.
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -31,6 +31,7 @@
 #include <linux/brlock.h>
 #include <linux/module.h>
+#include <asm/kmap_types.h>
 #include <asm/uaccess.h>
 #include <linux/highmem.h>