diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-07 10:47:34 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-07 10:47:34 -0700 |
| commit | 933b4f0f34b1e04019477c913a9ddbae705f3de9 (patch) | |
| tree | b6516cf51c7ac1ac8d818e5236f8c0c967e1c68c /arch/arm/mach-shmobile/board-ape6evm.c | |
| parent | 07d8a49c263c89c21d1e10b5550706ed8a58eb5e (diff) | |
| parent | 40fca03cae59cfd9b87142ca327abb8a4d386908 (diff) | |
Merge tag 'renesas-fixes5-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
From Simon Horman:
* Correct incorrect placement of __initdata tag in ape6evm board code
* tag 'renesas-fixes5-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag
(+ other patches already present in v3.12-rc4)
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/board-ape6evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ape6evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c index 24b87eea9da3..00e3add8e658 100644 --- a/arch/arm/mach-shmobile/board-ape6evm.c +++ b/arch/arm/mach-shmobile/board-ape6evm.c @@ -86,7 +86,7 @@ static struct gpio_keys_button gpio_buttons[] = { GPIO_KEY(KEY_VOLUMEDOWN, 329, "S21"), }; -static struct __initdata gpio_keys_platform_data ape6evm_keys_pdata = { +static struct gpio_keys_platform_data ape6evm_keys_pdata __initdata = { .buttons = gpio_buttons, .nbuttons = ARRAY_SIZE(gpio_buttons), }; |