aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-04-30 03:52:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:32 -0400
commit7f1133cbf20bc308d73ba49f971180924e12119b (patch)
treeb642ed3d5a731d2a1afad549122ba6b91bd14f26
parent3c42a449107bf76c59b8e0b6a30d070e9696e49c (diff)
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>
-rw-r--r--drivers/video/Kconfig2
-rw-r--r--drivers/video/pxafb.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 20a2bbd14ed7..bb1dadaa4a23 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1776,7 +1776,7 @@ config FB_PXA
1776 1776
1777config FB_PXA_SMARTPANEL 1777config FB_PXA_SMARTPANEL
1778 bool "PXA Smartpanel LCD support" 1778 bool "PXA Smartpanel LCD support"
1779 default y 1779 default n
1780 depends on FB_PXA 1780 depends on FB_PXA
1781 1781
1782config FB_PXA_PARAMETERS 1782config FB_PXA_PARAMETERS
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index a4d656497e9d..3ab6e3d973a1 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -720,7 +720,7 @@ static void setup_smart_timing(struct pxafb_info *fbi,
720 720
721static int pxafb_smart_thread(void *arg) 721static int pxafb_smart_thread(void *arg)
722{ 722{
723 struct pxafb_info *fbi = (struct pxafb_info *) arg; 723 struct pxafb_info *fbi = arg;
724 struct pxafb_mach_info *inf = fbi->dev->platform_data; 724 struct pxafb_mach_info *inf = fbi->dev->platform_data;
725 725
726 if (!fbi || !inf->smart_update) { 726 if (!fbi || !inf->smart_update) {