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 20a2bbd14ed701e0aaf639a690a1b581e6ebcd46..bb1dadaa4a23a1054cca3fbd56791d3cf50fcb1d 100644 (file)
--- 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 a4d656497e9da19ee633c144a76a0605db698775..3ab6e3d973a1670bef82cc28fa89cf1ba8e46d8f 100644 (file)
--- 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) {