diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 21:43:51 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 21:43:51 +0100 |
| commit | 37d7035da5b1f184c610b038b376c0c647d8d72b (patch) | |
| tree | c38d4058ad3232f985d9ed4501a8a842a2a47028 /arch/arm/mach-pxa/mainstone.c | |
| parent | [ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helper (diff) | |
| parent | [ARM] 5113/1: PXA SSP: Additional register definitions for PXA3xx SSP (diff) | |
| download | linux-dev-37d7035da5b1f184c610b038b376c0c647d8d72b.tar.xz linux-dev-37d7035da5b1f184c610b038b376c0c647d8d72b.zip | |
Merge branch 'pxa-devel' into pxa
Diffstat (limited to 'arch/arm/mach-pxa/mainstone.c')
| -rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 8cd3f81558cb..14eac2287e3f 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c @@ -110,9 +110,9 @@ static unsigned long mainstone_pin_config[] = { GPIO45_AC97_SYSCLK, /* Keypad */ - GPIO93_KP_DKIN_0 | WAKEUP_ON_LEVEL_HIGH, - GPIO94_KP_DKIN_1 | WAKEUP_ON_LEVEL_HIGH, - GPIO95_KP_DKIN_2 | WAKEUP_ON_LEVEL_HIGH, + GPIO93_KP_DKIN_0, + GPIO94_KP_DKIN_1, + GPIO95_KP_DKIN_2, GPIO100_KP_MKIN_0 | WAKEUP_ON_LEVEL_HIGH, GPIO101_KP_MKIN_1 | WAKEUP_ON_LEVEL_HIGH, GPIO102_KP_MKIN_2 | WAKEUP_ON_LEVEL_HIGH, @@ -514,7 +514,7 @@ static struct pxaohci_platform_data mainstone_ohci_platform_data = { .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[] = { 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), |