Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

diff --combined arch/arm/mach-ep93xx/Kconfig
index 93e54fd4e3d55900192f62e573d6d97a2919aa4b,91eee1dec4155549f6eb466b384774ea560ccfec..bec570ae6494d0bfacd8b479ee9876fbc61dbfeb
--- 1/arch/arm/mach-ep93xx/Kconfig
--- 2/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@@ -5,6 -5,7 +5,7 @@@ menu "Cirrus EP93xx Implementation Opti
  config EP93XX_SOC_COMMON
        bool
        default y
+       select SOC_BUS
        select LEDS_GPIO_REGISTER
  
  config CRUNCH
@@@ -194,6 -195,20 +195,6 @@@ config MACH_VISION_EP930
          Say 'Y' here if you want your kernel to support the
          Vision Engraving Systems EP9307 SoM.
  
 -choice
 -      prompt "Select a UART for early kernel messages"
 -
 -config EP93XX_EARLY_UART1
 -      bool "UART1"
 -
 -config EP93XX_EARLY_UART2
 -      bool "UART2"
 -
 -config EP93XX_EARLY_UART3
 -      bool "UART3"
 -
 -endchoice
 -
  endmenu
  
  endif