diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:06:35 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:06:35 +0200 |
| commit | 8600fb68cfa8f89e23cf872efb87fec641cc747d (patch) | |
| tree | 60ec7cbf9f2f09fd97f1895cc4b3854414fe1db9 /arch/arm/mach-shmobile/Kconfig | |
| parent | 8533bae35becc0b18dc5a6c59ead36dee57cfb47 (diff) | |
| parent | 70523b4e57cb6eeb1da7c8ebf19df855221825ad (diff) | |
| download | linux-next-8600fb68cfa8f89e23cf872efb87fec641cc747d.tar.gz | |
Merge branch 'renesas-armadillo' into renesas-board
* renesas-armadillo:
ARM: mach-shmobile: armadillo800eva: defconfig Allow use of armhf userspace
ARM: shmobile: armadillo800eva: A3SP domain includes USB
ARM: shmobile: armadillo800eva: A4LC domain includes LCDC
ARM: shmobile: armadillo800eva: USB Func enables external IRQ mode
ARM: mach-shmobile: add fixed voltage regulators to armadillo800eva
ARM: shmobile: use common extra gpio functions on armadillo800eva
ARM: shmobile: armadillo800eva: enable DMAEngine on USB
ARM: shmobile: armadillo800eva: enable DMAEngine on SDHI
ARM: shmobile: armadillo800eva: enable DMAEngine on FSI
ARM: shmobile: armadillo800eva: enable FSI-HDMI sound
ARM: shmobile: armadillo800eva: enable FSI-WM8978 sound
Conflicts:
arch/arm/mach-shmobile/Kconfig
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 0168382d3cba..4cacc2d22fbe 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -114,6 +114,7 @@ config MACH_ARMADILLO800EVA select ARCH_REQUIRE_GPIOLIB select USE_OF select REGULATOR_FIXED_VOLTAGE if REGULATOR + select SND_SOC_WM8978 if SND_SIMPLE_CARD config MACH_MARZEN bool "MARZEN board" |