summaryrefslogtreecommitdiffstats
path: root/drivers/video/pxafb.c
diff options
context:
space:
mode:
authorJaya Kumar <jayakumar.arm@gmail.com>2008-06-22 05:27:25 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-06-22 15:31:30 +0200
commitf1edfc420ac7beb90b27bf822036cbbfa32483f1 (patch)
tree2648dfbac57d0362afde9ed42ff617f9eeffbb8a /drivers/video/pxafb.c
parentSlab: Fix memory leak in fallback_alloc() (diff)
downloadlinux-f1edfc420ac7beb90b27bf822036cbbfa32483f1.tar.xz
linux-f1edfc420ac7beb90b27bf822036cbbfa32483f1.zip
[ARM] 5115/1: pxafb: fix ifdef for command line option handling
This bug was found and fixed by Lothar Wassmann. Previously, the use of ifndef CONFIG_MODULES made it such that pxafb command line option parsing was dependent on whether the kernel was built with module support. The ifndef should be MODULE so that parsing is dependent only on whether the driver is built-in or not. Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/video/pxafb.c')
-rw-r--r--drivers/video/pxafb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 7dcda187d9ba..eb23d1923332 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1588,7 +1588,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
static char g_options[256] __devinitdata = "";
-#ifndef CONFIG_MODULES
+#ifndef MODULE
static int __devinit pxafb_setup_options(void)
{
char *options = NULL;