diff options
| author | Patrick Mochel <mochel@segfault.osdl.org> | 2002-05-06 20:27:30 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@segfault.osdl.org> | 2002-05-06 20:27:30 -0700 |
| commit | 2a7b7310fb822fd5e7361d7ef76350abd366c361 (patch) | |
| tree | bced6ecf7fb872f369867601b9f2be79a760c0dd /drivers | |
| parent | 9f2fec0f2dc6b89dd14ed7663377d02bc9c590ba (diff) | |
| parent | 011e937335c2761db732569dcbea90761a2830d9 (diff) | |
Merge bk://ldm@bkbits.net/linux-2.5-pci
into segfault.osdl.org:/home/mochel/src/kernel/devel/linux-2.5-pci
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 29a75e248bd7..81c31a10ed25 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -580,7 +580,7 @@ static int __devinit pci_setup(char *str) return 1; } -subsys_initcall(pci_init); +device_initcall(pci_init); __setup("pci=", pci_setup); |