Merge bk://ldm.bkbits.net/linux-2.5-cls

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

Merge bk://ldm.bkbits.net/linux-2.5-cls
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
68239661 · Linus Torvalds · 5eda515d · 543d1be9 · 68239661 · 68239661
Commit 68239661 authored Aug 26, 2002 by Linus Torvalds
Expand all Hide 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>