diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 17:42:18 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 17:42:18 +0200 |
| commit | 013c5b4e6611746725cbcc0c39922d36d2968d50 (patch) | |
| tree | 0eba883b26683c284b604ea21f995d8b3b8e93cd /arch/arm/mach-shmobile/setup-r7s72100.c | |
| parent | 09d12ad7936df431ecbf0faf2b81c56cc4bb6392 (diff) | |
| parent | ad8c3af8b75ff26c5c887f2101da653bdcd53a38 (diff) | |
| download | op-kernel-dev-013c5b4e6611746725cbcc0c39922d36d2968d50.zip op-kernel-dev-013c5b4e6611746725cbcc0c39922d36d2968d50.tar.gz | |
Merge tag 'renesas-cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Renesas ARM Based SoC Cleanup Updates for v3.18" from Simon Horman:
* Remove Genmai board code
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r7s72100: Remove legacy board support
ARM: shmobile: r7s72100: genmai: Remove legacy board file
ARM: shmobile: r7s72100: genmai: Remove reference board file
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r7s72100.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r7s72100.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c index 46a93f7..4122104 100644 --- a/arch/arm/mach-shmobile/setup-r7s72100.c +++ b/arch/arm/mach-shmobile/setup-r7s72100.c @@ -24,7 +24,6 @@ #include "common.h" -#ifdef CONFIG_USE_OF static const char *r7s72100_boards_compat_dt[] __initdata = { "renesas,r7s72100", NULL, @@ -35,4 +34,3 @@ DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)") .init_late = shmobile_init_late, .dt_compat = r7s72100_boards_compat_dt, MACHINE_END -#endif /* CONFIG_USE_OF */ |
