Skip to content

Commit

Permalink
[ARM] 5115/1: pxafb: fix ifdef for command line option handling
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jaya Kumar authored and Russell King committed Jun 22, 2008
1 parent 481c534 commit f1edfc4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/video/pxafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f1edfc4

Please sign in to comment.