Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic',...

[pandora-kernel.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 903c9c4..9dd6101 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -381,16 +381,6 @@ config ARCH_MXS
        help
          Support for Freescale MXS-based family of processors
 
-config ARCH_STMP3XXX
-       bool "Freescale STMP3xxx"
-       select CPU_ARM926T
-       select CLKDEV_LOOKUP
-       select ARCH_REQUIRE_GPIOLIB
-       select GENERIC_CLOCKEVENTS
-       select USB_ARCH_HAS_EHCI
-       help
-         Support for systems based on the Freescale 3xxx CPUs.
-
 config ARCH_NETX
        bool "Hilscher NetX based"
        select CLKSRC_MMIO
@@ -1018,8 +1008,6 @@ source "arch/arm/mach-exynos4/Kconfig"
 
 source "arch/arm/mach-shmobile/Kconfig"
 
-source "arch/arm/plat-stmp3xxx/Kconfig"
-
 source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-u300/Kconfig"