diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /arch/i386/pci/direct.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/i386/pci/direct.c')
| -rw-r--r-- | arch/i386/pci/direct.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c index 5acf0b4743cf..431c9a51b157 100644 --- a/arch/i386/pci/direct.c +++ b/arch/i386/pci/direct.c | |||
| @@ -256,6 +256,8 @@ static int __init pci_check_type2(void) | |||
| 256 | 256 | ||
| 257 | void __init pci_direct_init(int type) | 257 | void __init pci_direct_init(int type) |
| 258 | { | 258 | { |
| 259 | if (type == 0) | ||
| 260 | return; | ||
| 259 | printk(KERN_INFO "PCI: Using configuration type %d\n", type); | 261 | printk(KERN_INFO "PCI: Using configuration type %d\n", type); |
| 260 | if (type == 1) | 262 | if (type == 1) |
| 261 | raw_pci_ops = &pci_direct_conf1; | 263 | raw_pci_ops = &pci_direct_conf1; |