aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 8ab027886034..590f4e6f505d 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -955,13 +955,12 @@ static int __devinit pci_setup(char *str)
955 } 955 }
956 str = k; 956 str = k;
957 } 957 }
958 return 1; 958 return 0;
959} 959}
960early_param("pci", pci_setup);
960 961
961device_initcall(pci_init); 962device_initcall(pci_init);
962 963
963__setup("pci=", pci_setup);
964
965#if defined(CONFIG_ISA) || defined(CONFIG_EISA) 964#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
966/* FIXME: Some boxes have multiple ISA bridges! */ 965/* FIXME: Some boxes have multiple ISA bridges! */
967struct pci_dev *isa_bridge; 966struct pci_dev *isa_bridge;