- ifdef fix in kmap_types.h (Oleg Drokin)

- remove redundant ext3 inclusions (Burton Windle)



 fs/ext3/fsync.c               |    2 --
 include/asm-i386/kmap_types.h |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff -puN include/asm-i386/kmap_types.h~misc include/asm-i386/kmap_types.h
--- 25/include/asm-i386/kmap_types.h~misc	2003-04-30 19:10:08.000000000 -0700
+++ 25-akpm/include/asm-i386/kmap_types.h	2003-04-30 19:10:08.000000000 -0700
@@ -3,7 +3,7 @@
 
 #include <linux/config.h>
 
-#if CONFIG_DEBUG_HIGHMEM
+#ifdef CONFIG_DEBUG_HIGHMEM
 # define D(n) __KM_FENCE_##n ,
 #else
 # define D(n)
diff -puN fs/ext3/fsync.c~misc fs/ext3/fsync.c
--- 25/fs/ext3/fsync.c~misc	2003-04-30 21:17:58.000000000 -0700
+++ 25-akpm/fs/ext3/fsync.c	2003-04-30 21:18:16.000000000 -0700
@@ -27,8 +27,6 @@
 #include <linux/jbd.h>
 #include <linux/ext3_fs.h>
 #include <linux/ext3_jbd.h>
-#include <linux/jbd.h>
-#include <linux/smp_lock.h>
 
 /*
  * akpm: A new design for ext3_sync_file().

_