Skip to content

Commit

Permalink
Merge tag 'renesas-defconfig4-for-v3.18' of git://git.kernel.org/pub/…
Browse files Browse the repository at this point in the history 
…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>
  • Loading branch information
Olof Johansson committed Sep 24, 2014
2 parents 2d9251e + 7d984c9 commit ecc5d5d
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/configs/shmobile_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ecc5d5d

Please sign in to comment.