Commit f1edfc42 authored Jun 22, 2008 by Jaya Kumar Committed by Russell King Jun 22, 2008

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

parent 481c5346

drivers/video/pxafb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message