diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-27 14:35:39 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-27 14:35:39 +0200 |
| commit | 97de17fde7cc7c15b402b911397780b51834a38b (patch) | |
| tree | c4d7a748ddeff46dc686548f1c6b0d184d0224f5 /arch/arm/configs/multi_v7_defconfig | |
| parent | 3888c381d88fc8d92c6d46b5a91ae77a5cb1c4cc (diff) | |
| parent | 821e79cb5686695f0adaef61587a184e953a937e (diff) | |
| download | blackbird-op-linux-97de17fde7cc7c15b402b911397780b51834a38b.tar.gz blackbird-op-linux-97de17fde7cc7c15b402b911397780b51834a38b.zip | |
Merge tag 'renesas-defconfig-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Renesas ARM Based SoC Defconfig Updates for v4.3
* Remove marzen_defconfig
* shmobile_defconfig and multi_v7_defconfig
- Enable DPCM Sound Card
- Enable r8a7793/gose platform
* tag 'renesas-defconfig-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Remove marzen_defconfig
ARM: multi_v7_defconfig: add Renesas DPCM Sound Card
ARM: shmobile: defconfig: add Renesas DPCM Sound Card
ARM: multi_v7_defconfig: Enable shmobile r8a7793/gose platform
ARM: shmobile: Enable gose board in multiplatform defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index cc74ef87bed1..4dcce1df26e5 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -80,6 +80,7 @@ CONFIG_ARCH_R8A7778=y CONFIG_ARCH_R8A7779=y CONFIG_ARCH_R8A7790=y CONFIG_ARCH_R8A7791=y +CONFIG_ARCH_R8A7793=y CONFIG_ARCH_R8A7794=y CONFIG_ARCH_SH73A0=y CONFIG_MACH_MARZEN=y @@ -463,6 +464,7 @@ CONFIG_SND_ATMEL_SOC=m CONFIG_SND_ATMEL_SOC_WM8904=m CONFIG_SND_SOC_SH4_FSI=m CONFIG_SND_SOC_RCAR=m +CONFIG_SND_SOC_RSRC_CARD=m CONFIG_SND_SOC_TEGRA=m CONFIG_SND_SOC_TEGRA_RT5640=m CONFIG_SND_SOC_TEGRA_WM8753=m |
