diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-04-30 00:52:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 08:29:32 -0700 |
commit | 7f1133cbf20bc308d73ba49f971180924e12119b (patch) | |
tree | b642ed3d5a731d2a1afad549122ba6b91bd14f26 /drivers | |
parent | 3c42a449107bf76c59b8e0b6a30d070e9696e49c (diff) | |
download | linux-stable-7f1133cbf20bc308d73ba49f971180924e12119b.tar.gz linux-stable-7f1133cbf20bc308d73ba49f971180924e12119b.tar.bz2 linux-stable-7f1133cbf20bc308d73ba49f971180924e12119b.zip |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/pxafb.c | 2 |
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 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 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, 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) { |