diff options
| author | Olof Johansson <olof@lixom.net> | 2014-09-24 11:16:40 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-24 11:16:56 -0700 |
| commit | ecc5d5d286188c71b12091a656b842e6bea3564c (patch) | |
| tree | af864580765af7fae46b3c14179486836f3db818 | |
| parent | 2d9251e3501356ceb44444a8f9a393b57163dc6a (diff) | |
| parent | 7d984c95723725d26f3961c1655c20256f0affdf (diff) | |
Merge tag 'renesas-defconfig4-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Merge "Fourth Round of Renesas ARM Based SoC Defconfig Updates for v3.18" from Simon Horman:
Fourth Round of Renesas ARM Based SoC Defconfig Updates for v3.18
* Enable r8a7794 SoC in shmobile_defconfig
* tag 'renesas-defconfig4-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Enable r8a7794 SoC in shmobile_defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 522275a0894..d7346ad5104 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH_R8A7740=y CONFIG_ARCH_R8A7779=y CONFIG_ARCH_R8A7790=y CONFIG_ARCH_R8A7791=y +CONFIG_ARCH_R8A7794=y CONFIG_MACH_KOELSCH=y CONFIG_MACH_LAGER=y CONFIG_MACH_MARZEN=y |