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