Merge tag 'clk-for-linus-3.14-part2' of git://git.linaro.org/people/mike.turquette...

[linux-2.6-block.git] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index e65948a9aa0e34fc1ad58b596477a8f28e5d6465..653b489479e0ee2d4166d6d033d315a1e56430e4 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -194,19 +194,6 @@ config MACH_OMAP2_TUSB6010
        depends on ARCH_OMAP2 && SOC_OMAP2420
        default y if MACH_NOKIA_N8X0
 
-config MACH_OMAP_H4
-       bool "OMAP 2420 H4 board"
-       depends on SOC_OMAP2420
-       default y
-       select OMAP_DEBUG_DEVICES
-       select OMAP_PACKAGE_ZAF
-
-config MACH_OMAP_2430SDP
-       bool "OMAP 2430 SDP board"
-       depends on SOC_OMAP2430
-       default y
-       select OMAP_PACKAGE_ZAC
-
 config MACH_OMAP3_BEAGLE
        bool "OMAP3 BEAGLE board"
        depends on ARCH_OMAP3