diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-14 01:12:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-14 01:12:07 -0700 |
| commit | 3b6250e707d8092236f629443d722be33e1b4bf2 (patch) | |
| tree | be8fbc8d423534ab66b7cc776f9464ae731b69f7 /arch/arm/mach-shmobile/board-lager.c | |
| parent | 70ba4d285a52db57d8b939745b4d01639d1e6ff2 (diff) | |
| parent | 8c8881b50691e17864cc54e5824b140e62fc2035 (diff) | |
Merge tag 'renesas-boards-cleanup-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman:
Renesas ARM based SoC boards cleanups for v3.12
* Add __initdata annotations to lager board
* Add __initconst annotations to ape6evm board
* tag 'renesas-boards-cleanup-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: lager: add missing __initdata
ARM: shmobile: ape6evm: add "__initconst" annotations where needed
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/board-lager.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-lager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index 79151532ef04..b161379a00f5 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@ -83,11 +83,11 @@ static struct regulator_consumer_supply fixed3v3_power_consumers[] = }; /* MMCIF */ -static struct sh_mmcif_plat_data mmcif1_pdata = { +static struct sh_mmcif_plat_data mmcif1_pdata __initdata = { .caps = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE, }; -static struct resource mmcif1_resources[] = { +static struct resource mmcif1_resources[] __initdata = { DEFINE_RES_MEM_NAMED(0xee220000, 0x80, "MMCIF1"), DEFINE_RES_IRQ(gic_spi(170)), }; |