1 files changed, 1 insertions, 40 deletions

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 665870dce3c8..ce66eb9be481 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -5,36 +5,6 @@ menu "TI OMAP Common Features"
 config ARCH_OMAP_OTG
         bool
 
-choice
-        prompt "OMAP System Type"
-        default ARCH_OMAP2PLUS
-
-config ARCH_OMAP1
-        bool "TI OMAP1"
-        select CLKDEV_LOOKUP
-        select CLKSRC_MMIO
-        select GENERIC_IRQ_CHIP
-        select HAVE_IDE
-        select IRQ_DOMAIN
-        select NEED_MACH_IO_H if PCCARD
-        select NEED_MACH_MEMORY_H
-        help
-          "Systems based on omap7xx, omap15xx or omap16xx"
-
-config ARCH_OMAP2PLUS
-        bool "TI OMAP2/3/4"
-        select CLKDEV_LOOKUP
-        select GENERIC_IRQ_CHIP
-        select OMAP_DM_TIMER
-        select PINCTRL
-        select PROC_DEVICETREE if PROC_FS
-        select SPARSE_IRQ
-        select USE_OF
-        help
-          "Systems based on OMAP2, OMAP3, OMAP4 or OMAP5"
-
-endchoice
-
 comment "OMAP Feature Selections"
 
 config OMAP_DEBUG_DEVICES
@@ -118,7 +88,7 @@ config OMAP_MUX_WARNINGS
 
 config OMAP_MBOX_FWK
         tristate "Mailbox framework support"
-        depends on ARCH_OMAP
+        depends on ARCH_OMAP && !ARCH_MULTIPLATFORM
         help
           Say Y here if you want to use OMAP Mailbox framework support for
           DSP, IVA1.0 and IVA2 in OMAP1/2/3.
@@ -177,15 +147,6 @@ config OMAP3_L2_AUX_SECURE_SERVICE_SET_ID
         help
           PPA routine service ID for setting L2 auxiliary control register.
 
-config OMAP_32K_TIMER_HZ
-        int "Kernel internal timer frequency for 32KHz timer"
-        range 32 1024
-        depends on OMAP_32K_TIMER
-        default "128"
-        help
-          Kernel internal timer frequency should be a divisor of 32768,
-          such as 64 or 128.
-
 config OMAP_DM_TIMER
         bool "Use dual-mode timer"
         depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS