Merge tag 'vt8500-multiplatform-3.9' of git://server.prisktech.co.nz/git/linuxwmt...

From Tony Prisk:
Convert arch-vt8500 to multiplatform only.

* tag 'vt8500-multiplatform-3.9' of git://server.prisktech.co.nz/git/linuxwmt:
  arm: vt8500: Remove remaining mach includes
  arm: vt8500: Convert debug-macro.S to be multiplatform friendly
  arm: vt8500: Remove single platform Kconfig options

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/Kconfig
index a1f8868becc615ba5249a36ef6070d7ac669301d,76efd438a140bade38eeee3d2c0a34964725bb50..7a0c31a6669ec11cf854cc352320a4a36e2d3cf2
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -942,36 -943,13 +942,20 @@@ config ARCH_OMAP
        depends on MMU
        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_HOLES_MEMORYMODEL
 +      select ARCH_OMAP
        select ARCH_REQUIRE_GPIOLIB
 +      select CLKDEV_LOOKUP
        select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
 +      select GENERIC_IRQ_CHIP
        select HAVE_CLK
 +      select HAVE_IDE
 +      select IRQ_DOMAIN
 +      select NEED_MACH_IO_H if PCCARD
 +      select NEED_MACH_MEMORY_H
        help
 -        Support for TI's OMAP platform (OMAP1/2/3/4).
 +        Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)
  
- config ARCH_VT8500_SINGLE
-       bool "VIA/WonderMedia 85xx"
-       select ARCH_HAS_CPUFREQ
-       select ARCH_REQUIRE_GPIOLIB
-       select CLKDEV_LOOKUP
-       select COMMON_CLK
-       select CPU_ARM926T
-       select GENERIC_CLOCKEVENTS
-       select GENERIC_GPIO
-       select HAVE_CLK
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
-       select USE_OF
-       help
-         Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
- 
  endchoice
  
  menu "Multiple platform selection"

diff --cc arch/arm/Kconfig.debug
Simple merge