X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fargv_split.c;h=5205a8dae5bc08c51a4f0f283dd812e2fab25a04;hb=1b871826b3dfcdcd78140d17c00e452eec6c12a4;hp=4096ed42f490869c252b1e33ea76050fe8f1ec92;hpb=40b42f1ebf653cd72c32eb1a1a0b9fea2dfbfd7d;p=linux-2.6-omap-h63xx.git

diff --git a/lib/argv_split.c b/lib/argv_split.c
index 4096ed42f49..5205a8dae5b 100644
--- a/lib/argv_split.c
+++ b/lib/argv_split.c
@@ -4,7 +4,8 @@
 
 #include <linux/kernel.h>
 #include <linux/ctype.h>
-#include <linux/bug.h>
+#include <linux/slab.h>
+#include <linux/module.h>
 
 static const char *skip_sep(const char *cp)
 {
@@ -75,7 +76,9 @@ char **argv_split(gfp_t gfp, const char *str, int *argcp)
 	if (argv == NULL)
 		goto out;
 
-	*argcp = argc;
+	if (argcp)
+		*argcp = argc;
+
 	argvp = argv;
 
 	while (*str) {