Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36caeb4e authored by Eric Miao's avatar Eric Miao Committed by Russell King
Browse files

[ARM] pxa: fix typo of CONFIG_*_MODULE 



The correct macro name when a driver is built as a module is
CONFIG_*_MODULE instead of CONFIG_*_MODULES. This patch fixes
this in several places.

Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8a6e8873

arch/arm/mach-pxa/littleton.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ static struct platform_device smc91x_device = { 
	.resource	= smc91x_resources,

	.resource	= smc91x_resources,

};

};





#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULES)

#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)

/* use bit 30, 31 as the indicator of command parameter number */

/* use bit 30, 31 as the indicator of command parameter number */

#define CMD0(x)		((0x00000000) | ((x) << 9))

#define CMD0(x)		((0x00000000) | ((x) << 9))

#define CMD1(x, x1)	((0x40000000) | ((x) << 9) | 0x100 | (x1))

#define CMD1(x, x1)	((0x40000000) | ((x) << 9) | 0x100 | (x1))
@@ -311,9 +311,9 @@ static void littleton_init_lcd(void) 
}

}

#else

#else

static inline void littleton_init_lcd(void) {};

static inline void littleton_init_lcd(void) {};

#endif /* CONFIG_FB_PXA || CONFIG_FB_PXA_MODULES */

#endif /* CONFIG_FB_PXA || CONFIG_FB_PXA_MODULE */





#if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULES)

#if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE)

static unsigned int littleton_matrix_key_map[] = {

static unsigned int littleton_matrix_key_map[] = {

	/* KEY(row, col, key_code) */

	/* KEY(row, col, key_code) */

	KEY(1, 3, KEY_0), KEY(0, 0, KEY_1), KEY(1, 0, KEY_2), KEY(2, 0, KEY_3),

	KEY(1, 3, KEY_0), KEY(0, 0, KEY_1), KEY(1, 0, KEY_2), KEY(2, 0, KEY_3),

arch/arm/mach-pxa/mainstone.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -513,7 +513,7 @@ static struct pxaohci_platform_data mainstone_ohci_platform_data = { 
	.init		= mainstone_ohci_init,

	.init		= mainstone_ohci_init,

};

};





#if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULES)

#if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE)

static unsigned int mainstone_matrix_keys[] = {

static unsigned int mainstone_matrix_keys[] = {

	KEY(0, 0, KEY_A), KEY(1, 0, KEY_B), KEY(2, 0, KEY_C),

	KEY(0, 0, KEY_A), KEY(1, 0, KEY_B), KEY(2, 0, KEY_C),

	KEY(3, 0, KEY_D), KEY(4, 0, KEY_E), KEY(5, 0, KEY_F),

	KEY(3, 0, KEY_D), KEY(4, 0, KEY_E), KEY(5, 0, KEY_F),

arch/arm/mach-pxa/zylonite.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -259,7 +259,7 @@ static void __init zylonite_init_mmc(void) 
static inline void zylonite_init_mmc(void) {}

static inline void zylonite_init_mmc(void) {}

#endif

#endif





#if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULES)

#if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE)

static unsigned int zylonite_matrix_key_map[] = {

static unsigned int zylonite_matrix_key_map[] = {

	/* KEY(row, col, key_code) */

	/* KEY(row, col, key_code) */

	KEY(0, 0, KEY_A), KEY(0, 1, KEY_B), KEY(0, 2, KEY_C), KEY(0, 5, KEY_D),

	KEY(0, 0, KEY_A), KEY(0, 1, KEY_B), KEY(0, 2, KEY_C), KEY(0, 5, KEY_D),