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

diff --cc arch/arm/mach-shmobile/Kconfig
index 0168382,1542e91..4cacc2d
--- 1/arch/arm/mach-shmobile/Kconfig
--- 2/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -113,7 -106,7 +113,8 @@@ config MACH_ARMADILLO800EV
        depends on ARCH_R8A7740
        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"

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge