Merge tag 'imx-soc-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index eec053c62fa0ec05f49f676f7e945e71bdd1a26d..e55ae63bb030bf1fd340f1aa25972a930521e250 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -152,12 +152,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
 
@@ -267,7 +261,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"