From 28bbb984d81ff09046442647dd04f066d61481de Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Wed, 16 May 2007 10:50:12 -0700 Subject: [PATCH] ARM: OMAP: Update recent gpio-keys changes in apollon board [PATCH] ARM: OMAP: Update recent gpio-keys changes in apollon board - Also fix section mismatch: reference to .init.text: from .text in apollon board Signed-off-by: Kyungmin Park Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-apollon-keys.c | 6 +++--- arch/arm/mach-omap2/board-apollon.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/board-apollon-keys.c b/arch/arm/mach-omap2/board-apollon-keys.c index 6cd29ec348d..8cd2e52bf2c 100644 --- a/arch/arm/mach-omap2/board-apollon-keys.c +++ b/arch/arm/mach-omap2/board-apollon-keys.c @@ -24,17 +24,17 @@ static struct gpio_keys_button apollon_gpio_keys_buttons[] = { [0] = { - .keycode = KEY_ENTER, + .code = KEY_ENTER, .gpio = SW_ENTER_GPIO16, .desc = "enter sw", }, [1] = { - .keycode = KEY_UP, + .code = KEY_UP, .gpio = SW_UP_GPIO17, .desc = "up sw", }, [2] = { - .keycode = KEY_DOWN, + .code = KEY_DOWN, .gpio = SW_DOWN_GPIO58, .desc = "down sw", }, diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 9e6dd0bcb09..60adb626fbc 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c @@ -270,7 +270,7 @@ static struct omap_lcd_config apollon_lcd_config __initdata = { .ctrl_name = "internal", }; -static struct omap_board_config_kernel apollon_config[] = { +static struct omap_board_config_kernel apollon_config[] __initdata = { { OMAP_TAG_UART, &apollon_uart_config }, { OMAP_TAG_MMC, &apollon_mmc_config }, { OMAP_TAG_USB, &apollon_usb_config }, -- 2.41.1