diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 18:33:51 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 18:33:51 +0200 |
| commit | 109528b2be2c0c893dcb07abdb34a1f01f6ad665 (patch) | |
| tree | 6912de535ae780e536f948f9cc122c2115940175 /arch | |
| parent | Merge tag 'mvebu-defconfig-3.17' of git://git.infradead.org/linux-mvebu into ... (diff) | |
| parent | ARM: shmobile: Enable genmai board in multiplatform defconfig (diff) | |
| download | linux-109528b2be2c0c893dcb07abdb34a1f01f6ad665.tar.xz linux-109528b2be2c0c893dcb07abdb34a1f01f6ad665.zip | |
Merge tag 'renesas-defconfig2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Merge "Second Round of Renesas ARM Based SoC Defconfig Updates for v3.17" from
Simon Horman:
* Enable genmai board in multiplatform defconfig
* tag 'renesas-defconfig2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Enable genmai board in multiplatform defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index c4b72aa48e67..5f05e98eb762 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -10,9 +10,11 @@ CONFIG_PERF_EVENTS=y CONFIG_SLAB=y CONFIG_ARCH_SHMOBILE_MULTI=y CONFIG_ARCH_EMEV2=y +CONFIG_ARCH_R7S72100=y CONFIG_ARCH_R8A7779=y CONFIG_ARCH_R8A7790=y CONFIG_ARCH_R8A7791=y +CONFIG_MACH_GENMAI=y CONFIG_MACH_KOELSCH=y CONFIG_MACH_LAGER=y CONFIG_MACH_MARZEN=y |