diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 20:16:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 20:16:17 +0200 |
| commit | 231bf80f7f14107f7ecfa2e0a2b0c56e6a793284 (patch) | |
| tree | 268a7dc003f1a36554f784086cb59f211119e0c1 /arch/arm/mach-shmobile/board-lager.c | |
| parent | Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... (diff) | |
| parent | Merge tag 'renesas-boards-for-v3.17' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | linux-231bf80f7f14107f7ecfa2e0a2b0c56e6a793284.tar.xz linux-231bf80f7f14107f7ecfa2e0a2b0c56e6a793284.zip | |
Merge tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board changes from Olof Johansson:
"This is the smallest board branch we have ever had. Most of this is a
few cleanups for board code for Renesas shmobile, with a bit of legacy
driver support added. This is strongly trending in the right
direction now"
* tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: shmobile: Enable R-Car Gen2 CMA code in board files
ARM: shmobile: armadillo800eva reference: Spelling s/ED/LED/
ARM: shmobile: armadillo800eva legacy: Add LED support
ARM: shmobile: lager-reference: Remove workarounds for core clock issues
ARM: shmobile: koelsch-reference: Remove workarounds for core clock issues
Diffstat (limited to 'arch/arm/mach-shmobile/board-lager.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-lager.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index 18331ac375f1..e1d8215da0b0 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@ -887,5 +887,6 @@ DT_MACHINE_START(LAGER_DT, "lager") .init_time = rcar_gen2_timer_init, .init_machine = lager_init, .init_late = shmobile_init_late, + .reserve = rcar_gen2_reserve, .dt_compat = lager_boards_compat_dt, MACHINE_END |