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

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

diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
index 9adcb9e76f5445d040848817954d86b065856e0c..7a602069bab99d334eecf147a5abb82e1bec5d4e 100644 (file)
--- a/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -1,13 +1,18 @@
 config ARCH_VT8500
-       bool "VIA/WonderMedia 85xx" if ARCH_MULTI_V5
-       default ARCH_VT8500_SINGLE
+       bool
        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select CLKSRC_OF
-       select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
        select VT8500_TIMER
        help
          Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+
+config ARCH_WM8505
+       bool "VIA/Wondermedia 85xx and WM8650"
+       depends on ARCH_MULTI_V5
+       select ARCH_VT8500
+       select CPU_ARM926T
+       help