1 files changed, 6 insertions, 17 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 13f89a262fa8..a3ffd1a391a7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -371,7 +371,6 @@ config ARCH_CNS3XXX
 config ARCH_CLPS711X
         bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
         select ARCH_REQUIRE_GPIOLIB
-        select ARCH_USES_GETTIMEOFFSET
         select AUTO_ZRELADDR
         select CLKDEV_LOOKUP
         select COMMON_CLK
@@ -951,22 +950,6 @@ config ARCH_OMAP
         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_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"
@@ -1231,6 +1214,7 @@ config ARM_ERRATA_430973
 config ARM_ERRATA_458693
         bool "ARM errata: Processor deadlock when a false hazard is created"
         depends on CPU_V7
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 458693 Cortex-A8 (r2p0)
           erratum. For very specific sequences of memory operations, it is
@@ -1244,6 +1228,7 @@ config ARM_ERRATA_458693
 config ARM_ERRATA_460075
         bool "ARM errata: Data written to the L2 cache can be overwritten with stale data"
         depends on CPU_V7
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 460075 Cortex-A8 (r2p0)
           erratum. Any asynchronous access to the L2 cache may encounter a
@@ -1256,6 +1241,7 @@ config ARM_ERRATA_460075
 config ARM_ERRATA_742230
         bool "ARM errata: DMB operation may be faulty"
         depends on CPU_V7 && SMP
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 742230 Cortex-A9
           (r1p0..r2p2) erratum. Under rare circumstances, a DMB instruction
@@ -1268,6 +1254,7 @@ config ARM_ERRATA_742230
 config ARM_ERRATA_742231
         bool "ARM errata: Incorrect hazard handling in the SCU may lead to data corruption"
         depends on CPU_V7 && SMP
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 742231 Cortex-A9
           (r2p0..r2p2) erratum. Under certain conditions, specific to the
@@ -1318,6 +1305,7 @@ config PL310_ERRATA_727915
 config ARM_ERRATA_743622
         bool "ARM errata: Faulty hazard checking in the Store Buffer may lead to data corruption"
         depends on CPU_V7
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 743622 Cortex-A9
           (r2p*) erratum. Under very rare conditions, a faulty
@@ -1331,6 +1319,7 @@ config ARM_ERRATA_743622
 config ARM_ERRATA_751472
         bool "ARM errata: Interrupted ICIALLUIS may prevent completion of broadcasted operation"
         depends on CPU_V7
+        depends on !ARCH_MULTIPLATFORM
         help
           This option enables the workaround for the 751472 Cortex-A9 (prior
           to r3p0) erratum. An interrupted ICIALLUIS operation may prevent the