Merge with 2.3.27.

1 files changed, 6 insertions, 15 deletions

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 37b8e15c5..dadd3c67e 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -17,23 +17,14 @@
  */
 
 #include <linux/module.h>
-
-#include <stdarg.h>
-
-#include <asm/bitops.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/ext2_fs.h>
-#include <linux/malloc.h>
-#include <linux/sched.h>
-#include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/locks.h>
-#include <linux/blkdev.h>
+#include <linux/fs.h>
+#include <linux/slab.h>
 #include <linux/init.h>
+#include <linux/locks.h>
+#include <asm/uaccess.h>
+
+
 
 static char error_buf[1024];