3 files changed, 2 insertions, 10 deletions

diff --git a/arch/arm/mach-iop33x/Kconfig b/arch/arm/mach-iop33x/Kconfig
index 45598e096898..9aa016bb18f9 100644
--- a/arch/arm/mach-iop33x/Kconfig
+++ b/arch/arm/mach-iop33x/Kconfig
@@ -16,14 +16,6 @@ config MACH_IQ80332
           Say Y here if you want to run your kernel on the Intel IQ80332
           evaluation kit for the IOP332 chipset.
 
-config IOP3XX_ATU
-        bool "Enable the PCI Controller"
-        default y
-        help
-          Say Y here if you want the IOP to initialize its PCI Controller.
-          Say N if the IOP is an add in card, the host system owns the PCI
-          bus in this case.
-
 endmenu
 
 endif
diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c
index 433188ebff2a..de39fd778579 100644
--- a/arch/arm/mach-iop33x/iq80331.c
+++ b/arch/arm/mach-iop33x/iq80331.c
@@ -89,7 +89,7 @@ static struct hw_pci iq80331_pci __initdata = {
         .swizzle        = pci_std_swizzle,
         .nr_controllers = 1,
         .setup          = iop3xx_pci_setup,
-        .preinit        = iop3xx_pci_preinit,
+        .preinit        = iop3xx_pci_preinit_cond,
         .scan           = iop3xx_pci_scan_bus,
         .map_irq        = iq80331_pci_map_irq,
 };
diff --git a/arch/arm/mach-iop33x/iq80332.c b/arch/arm/mach-iop33x/iq80332.c
index 416c09564cc6..4904fd78445f 100644
--- a/arch/arm/mach-iop33x/iq80332.c
+++ b/arch/arm/mach-iop33x/iq80332.c
@@ -89,7 +89,7 @@ static struct hw_pci iq80332_pci __initdata = {
         .swizzle        = pci_std_swizzle,
         .nr_controllers = 1,
         .setup          = iop3xx_pci_setup,
-        .preinit        = iop3xx_pci_preinit,
+        .preinit        = iop3xx_pci_preinit_cond,
         .scan           = iop3xx_pci_scan_bus,
         .map_irq        = iq80332_pci_map_irq,
 };