diff --git a/[refs] b/[refs]
index cb26c07babae..7341223968e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 118c71bcacce82a4317c9bd99c6a15af14020aee
+refs/heads/master: fb79ffa4ddbe3f6f30fdb8429b5bad84d25ae6ef
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
index 7b4cd250bec8..9fc10b9e6f57 100644
--- a/trunk/drivers/video/pxafb.c
+++ b/trunk/drivers/video/pxafb.c
@@ -1396,7 +1396,8 @@ static struct platform_driver pxafb_driver = {
 int __devinit pxafb_setup(char *options)
 {
 # ifdef CONFIG_FB_PXA_PARAMETERS
-	strlcpy(g_options, options, sizeof(g_options));
+	if (options)
+		strlcpy(g_options, options, sizeof(g_options));
 # endif
 	return 0;
 }