diff options
author | Olof Johansson <olof@lixom.net> | 2013-01-12 12:06:31 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-12 12:09:34 -0500 |
commit | 2fd73eb62bcf28ee1f1afa47b9e7cf88494d0da1 (patch) | |
tree | 92aff19ea90cf4e95f4e9748c2a6db98ab0149af /arch/arm/Kconfig | |
parent | 61301332484966cb4e92041221bb185b6cd4d4ed (diff) | |
parent | ce3f386fdf10d79eaf6ebd63bb7adbd95f08f9f0 (diff) |
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>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a1f8868becc6..7a0c31a6669e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -956,22 +956,6 @@ config ARCH_OMAP1 | |||
956 | help | 956 | help |
957 | Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx) | 957 | Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx) |
958 | 958 | ||
959 | config ARCH_VT8500_SINGLE | ||
960 | bool "VIA/WonderMedia 85xx" | ||
961 | select ARCH_HAS_CPUFREQ | ||
962 | select ARCH_REQUIRE_GPIOLIB | ||
963 | select CLKDEV_LOOKUP | ||
964 | select COMMON_CLK | ||
965 | select CPU_ARM926T | ||
966 | select GENERIC_CLOCKEVENTS | ||
967 | select GENERIC_GPIO | ||
968 | select HAVE_CLK | ||
969 | select MULTI_IRQ_HANDLER | ||
970 | select SPARSE_IRQ | ||
971 | select USE_OF | ||
972 | help | ||
973 | Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. | ||
974 | |||
975 | endchoice | 959 | endchoice |
976 | 960 | ||
977 | menu "Multiple platform selection" | 961 | menu "Multiple platform selection" |