1 files changed, 1 insertions, 27 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 0af7ca02314d..cb31d4390d52 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -6,7 +6,6 @@ config ARCH_OMAP2
         depends on ARCH_MULTI_V6
         select ARCH_OMAP2PLUS
         select CPU_V6
-        select MULTI_IRQ_HANDLER
         select SOC_HAS_OMAP2_SDRC
 
 config ARCH_OMAP3
@@ -15,13 +14,10 @@ config ARCH_OMAP3
         select ARCH_OMAP2PLUS
         select ARCH_HAS_OPP
         select ARM_CPU_SUSPEND if PM
-        select CPU_V7
-        select MULTI_IRQ_HANDLER
         select OMAP_INTERCONNECT
         select PM_OPP if PM
         select PM_RUNTIME if CPU_IDLE
         select SOC_HAS_OMAP2_SDRC
-        select USB_ARCH_HAS_EHCI if USB_SUPPORT
 
 config ARCH_OMAP4
         bool "TI OMAP4"
@@ -33,16 +29,13 @@ config ARCH_OMAP4
         select ARM_ERRATA_720789
         select ARM_GIC
         select CACHE_L2X0
-        select CPU_V7
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
-        select HAVE_SMP
         select OMAP_INTERCONNECT
         select PL310_ERRATA_588369
         select PL310_ERRATA_727915
         select PM_OPP if PM
         select PM_RUNTIME if CPU_IDLE
-        select USB_ARCH_HAS_EHCI if USB_SUPPORT
         select ARM_ERRATA_754322
         select ARM_ERRATA_775420
 
@@ -53,10 +46,8 @@ config SOC_OMAP5
         select ARCH_HAS_OPP
         select ARM_CPU_SUSPEND if PM
         select ARM_GIC
-        select CPU_V7
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
-        select HAVE_SMP
         select HAVE_ARM_ARCH_TIMER
         select ARM_ERRATA_798181 if SMP
 
@@ -66,16 +57,12 @@ config SOC_AM33XX
         select ARCH_OMAP2PLUS
         select ARCH_HAS_OPP
         select ARM_CPU_SUSPEND if PM
-        select CPU_V7
-        select MULTI_IRQ_HANDLER
 
 config SOC_AM43XX
         bool "TI AM43x"
         depends on ARCH_MULTI_V7
-        select CPU_V7
         select ARCH_OMAP2PLUS
         select ARCH_HAS_OPP
-        select MULTI_IRQ_HANDLER
         select ARM_GIC
         select MACH_OMAP_GENERIC
 
@@ -86,9 +73,8 @@ config SOC_DRA7XX
         select ARCH_HAS_OPP
         select ARM_CPU_SUSPEND if PM
         select ARM_GIC
-        select CPU_V7
-        select HAVE_SMP
         select HAVE_ARM_ARCH_TIMER
+        select IRQ_CROSSBAR
 
 config ARCH_OMAP2PLUS
         bool
@@ -98,17 +84,12 @@ config ARCH_OMAP2PLUS
         select ARCH_OMAP
         select ARCH_REQUIRE_GPIOLIB
         select CLKSRC_MMIO
-        select COMMON_CLK
-        select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_CHIP
         select MACH_OMAP_GENERIC
         select OMAP_DM_TIMER
         select PINCTRL
-        select PROC_DEVICETREE if PROC_FS
         select SOC_BUS
-        select SPARSE_IRQ
         select TI_PRIV_EDMA
-        select USE_OF
         help
           Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
 
@@ -169,12 +150,6 @@ config SOC_TI81XX
         depends on ARCH_OMAP3
         default y
 
-config OMAP_PACKAGE_ZAF
-       bool
-
-config OMAP_PACKAGE_ZAC
-       bool
-
 config OMAP_PACKAGE_CBC
        bool
 
@@ -284,7 +259,6 @@ config MACH_NOKIA_N8X0
         default y
         select MACH_NOKIA_N810
         select MACH_NOKIA_N810_WIMAX
-        select OMAP_PACKAGE_ZAC
 
 config MACH_NOKIA_RX51
         bool "Nokia N900 (RX-51) phone"