Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / fs / proc / proc_misc.c

diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 6aa2aa779a09e1e81a02742bc5bdb8c3f68d5d59..9f2cfc30f9cfc0176ac6096e87df859b4c52cd3d 100644 (file)
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -26,7 +26,6 @@
 #include <linux/mman.h>
 #include <linux/proc_fs.h>
 #include <linux/ioport.h>
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/pagemap.h>