Merge branch 'for-next' into for-linus

[~andy/linux] / kernel / params.c

diff --git a/kernel/params.c b/kernel/params.c
index 2278ce244cf810b53e6fe5ce3658bc04e6a4b40b..0c4fba6640902cba629a46b94cefee6541a06fc3 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