diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 12:33:51 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 12:33:51 -0400 |
| commit | 109528b2be2c0c893dcb07abdb34a1f01f6ad665 (patch) | |
| tree | 6912de535ae780e536f948f9cc122c2115940175 /arch/arm | |
| parent | 73290cc9c0c269605227c4f75b2727c325ebc5fd (diff) | |
| parent | c61010050d3baa3e1a3964bec7e62437d21107c6 (diff) | |
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/arm')
| -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 | |||
| 10 | CONFIG_SLAB=y | 10 | CONFIG_SLAB=y |
| 11 | CONFIG_ARCH_SHMOBILE_MULTI=y | 11 | CONFIG_ARCH_SHMOBILE_MULTI=y |
| 12 | CONFIG_ARCH_EMEV2=y | 12 | CONFIG_ARCH_EMEV2=y |
| 13 | CONFIG_ARCH_R7S72100=y | ||
| 13 | CONFIG_ARCH_R8A7779=y | 14 | CONFIG_ARCH_R8A7779=y |
| 14 | CONFIG_ARCH_R8A7790=y | 15 | CONFIG_ARCH_R8A7790=y |
| 15 | CONFIG_ARCH_R8A7791=y | 16 | CONFIG_ARCH_R8A7791=y |
| 17 | CONFIG_MACH_GENMAI=y | ||
| 16 | CONFIG_MACH_KOELSCH=y | 18 | CONFIG_MACH_KOELSCH=y |
| 17 | CONFIG_MACH_LAGER=y | 19 | CONFIG_MACH_LAGER=y |
| 18 | CONFIG_MACH_MARZEN=y | 20 | CONFIG_MACH_MARZEN=y |