Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 482ba91e73a7d33e06b53c78d8d8c26d1089be2f..bfd7c69c85a5dd5faf4fa44461dcaff9d6a0804e 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -932,32 +932,24 @@ config ARCH_DAVINCI
        help
          Support for TI's DaVinci platform.
 
-config ARCH_OMAP
-       bool "TI OMAP"
+config ARCH_OMAP1
+       bool "TI OMAP1"
        depends on MMU
        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_HOLES_MEMORYMODEL
-       select ARCH_REQUIRE_GPIOLIB
-       select CLKSRC_MMIO
-       select GENERIC_CLOCKEVENTS
-       select HAVE_CLK
-       help
-         Support for TI's OMAP platform (OMAP1/2/3/4).
-
-config ARCH_VT8500_SINGLE
-       bool "VIA/WonderMedia 85xx"
-       select ARCH_HAS_CPUFREQ
+       select ARCH_OMAP
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
-       select COMMON_CLK
-       select CPU_ARM926T
+       select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
+       select GENERIC_IRQ_CHIP
        select HAVE_CLK
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
-       select USE_OF
+       select HAVE_IDE
+       select IRQ_DOMAIN
+       select NEED_MACH_IO_H if PCCARD
+       select NEED_MACH_MEMORY_H
        help
-         Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+         Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)
 
 endchoice