X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Farm%2Fmach-iop33x%2Fiq80331.c;h=de39fd778579722c8ac99c2eea39659dbf9862bb;hb=96916090f488986a4ebb8e9ffa6a3b50881d5ccd;hp=433188ebff2a6dd9f6ad04ab9b8c640b25f7067f;hpb=1f1c2881f673671539b25686df463518d69c4649;p=~andy%2Flinux diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c index 433188ebff2..de39fd77857 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, };