From: Olof Johansson <olof@lixom.net>
Date: Sat, 12 Jan 2013 17:06:31 +0000 (-0800)
Subject: Merge tag 'vt8500-multiplatform-3.9' of git://server.prisktech.co.nz/git/linuxwmt... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2fd73eb62bcf28ee1f1afa47b9e7cf88494d0da1;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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

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>
---

2fd73eb62bcf28ee1f1afa47b9e7cf88494d0da1
diff --cc arch/arm/Kconfig
index a1f8868becc6,76efd438a140..7a0c31a6669e
--- a/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"