Merge commit '81fd23e2b3ccf71c807e671444e8accaba98ca53' of https://git.pengutronix...

[linux-2.6-microblaze.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 06b6187..82f908f 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -394,7 +394,8 @@ config ARCH_IXP4XX
        select HAVE_PCI
        select IXP4XX_IRQ
        select IXP4XX_TIMER
-       select NEED_MACH_IO_H
+       # With the new PCI driver this is not needed
+       select NEED_MACH_IO_H if IXP4XX_PCI_LEGACY
        select USB_EHCI_BIG_ENDIAN_DESC
        select USB_EHCI_BIG_ENDIAN_MMIO
        help