Merge ../linus

[linux-drm-fsl-dcu.git] / arch / i386 / pci / direct.c

diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c
index 5acf0b4743cfc74ba1cc04e34e708449a3d03ecc..431c9a51b1578bbaf39de3bcefc95d2087a73a38 100644 (file)
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
@@ -256,6 +256,8 @@ static int __init pci_check_type2(void)
 
 void __init pci_direct_init(int type)
 {
+       if (type == 0)
+               return;
        printk(KERN_INFO "PCI: Using configuration type %d\n", type);
        if (type == 1)
                raw_pci_ops = &pci_direct_conf1;