Commit f1edfc42 authored by Jaya Kumar's avatar Jaya Kumar Committed by Russell King

[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: default avatarJaya Kumar <jayakumar.lkml@gmail.com>
Acked-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Acked-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 481c5346
...@@ -1588,7 +1588,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options) ...@@ -1588,7 +1588,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
static char g_options[256] __devinitdata = ""; static char g_options[256] __devinitdata = "";
#ifndef CONFIG_MODULES #ifndef MODULE
static int __devinit pxafb_setup_options(void) static int __devinit pxafb_setup_options(void)
{ {
char *options = NULL; char *options = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment