Merge branch 'for-next' into for-linus

[safe/jmp/linux-2.6] / kernel / params.c

diff --git a/kernel/params.c b/kernel/params.c
index 2278ce2..0c4fba6 100644 (file)
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -24,7 +24,6 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/ctype.h>
-#include <linux/string.h>
 
 #if 0
 #define DEBUGP printk