From: Jaya Kumar <jayakumar.arm@gmail.com>
Date: Sun, 22 Jun 2008 03:27:25 +0000 (+0100)
Subject: [ARM] 5115/1: pxafb: fix ifdef for command line option handling
X-Git-Tag: v2.6.26-rc9~74^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f1edfc420ac7beb90b27bf822036cbbfa32483f1;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 7dcda187d9b..eb23d192333 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;