Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / fs / jffs / jffs_fm.h

diff --git a/fs/jffs/jffs_fm.h b/fs/jffs/jffs_fm.h
index c794d923df2ae46d1365c940f4bfa2d00968cbe6..9ee6ad29eff5de856f5401464346a5b110324bc3 100644 (file)
--- a/fs/jffs/jffs_fm.h
+++ b/fs/jffs/jffs_fm.h
@@ -20,7 +20,6 @@
 #ifndef __LINUX_JFFS_FM_H__
 #define __LINUX_JFFS_FM_H__
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/jffs.h>
 #include <linux/mtd/mtd.h>