From: Eric Miao <eric.miao@marvell.com>
Date: Wed, 30 Apr 2008 07:52:27 +0000 (-0700)
Subject: pxafb: preliminary smart panel interface support (update)
X-Git-Tag: v2.6.26-rc1~324
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f1133cbf20bc308d73ba49f971180924e12119b;p=linux-2.6

pxafb: preliminary smart panel interface support (update)

FB_PXA_SMARTPANEL defaults to "n" and removed the cast to void *.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: Eric Miao <eric.miao@marvell.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 20a2bbd14e..bb1dadaa4a 100644
--- a/drivers/video/Kconfig
+++ b/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/drivers/video/pxafb.c b/drivers/video/pxafb.c
index a4d656497e..3ab6e3d973 100644
--- a/drivers/video/pxafb.c
+++ b/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) {