diff --git a/[refs] b/[refs]
index 2622db43c2d2..7d8e47a2b288 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c42a449107bf76c59b8e0b6a30d070e9696e49c
+refs/heads/master: 7f1133cbf20bc308d73ba49f971180924e12119b
diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig
index 20a2bbd14ed7..bb1dadaa4a23 100644
--- a/trunk/drivers/video/Kconfig
+++ b/trunk/drivers/video/Kconfig
@@ -1776,7 +1776,7 @@ config FB_PXA
 
 config FB_PXA_SMARTPANEL
 	bool "PXA Smartpanel LCD support"
-	default y
+	default n
 	depends on FB_PXA
 
 config FB_PXA_PARAMETERS
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
index a4d656497e9d..3ab6e3d973a1 100644
--- a/trunk/drivers/video/pxafb.c
+++ b/trunk/drivers/video/pxafb.c
@@ -720,7 +720,7 @@ static void setup_smart_timing(struct pxafb_info *fbi,
 
 static int pxafb_smart_thread(void *arg)
 {
-	struct pxafb_info *fbi = (struct pxafb_info *) arg;
+	struct pxafb_info *fbi = arg;
 	struct pxafb_mach_info *inf = fbi->dev->platform_data;
 
 	if (!fbi || !inf->smart_update) {