Merge tag 'edac_fixes_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 83efe914bf7df4c422f02d7cc6093982093401a2..8896e71586f5e2255149db0ac4eb5cf90ece9e6b 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -6,7 +6,6 @@ comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
 
 config MACH_PXA27X_DT
        bool "Support PXA27x platforms from device tree"
-       select CPU_PXA27x
        select POWER_SUPPLY
        select PXA27x
        select USE_OF
@@ -84,14 +83,12 @@ config ARCH_VIPER
        select I2C_GPIO if I2C=y
        select ISA
        select PXA25x
-       select PXA_HAVE_ISA_IRQS
 
 config MACH_ARCOM_ZEUS
        bool "Arcom/Eurotech ZEUS SBC"
        select ARCOM_PCMCIA
        select ISA
        select PXA27x
-       select PXA_HAVE_ISA_IRQS
 
 config MACH_BALLOON3
        bool "Balloon 3 board"
@@ -691,9 +688,6 @@ config SHARPSL_PM_MAX1111
        select SPI
        select SPI_MASTER
 
-config PXA_HAVE_ISA_IRQS
-       bool
-
 config PXA310_ULPI
        bool