diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 19:37:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 19:37:10 -0500 |
| commit | 12f981f9028da2402c236544c78b8378a278f830 (patch) | |
| tree | 7983fdf95d77ad241e09db861bb90a629eee753f /drivers/pci/hotplug-pci.c | |
| parent | 10955d2251387df3997d8b9b6c572dfad9f23dd0 (diff) | |
| parent | c1ef5cbd03921047c2eafb998132e562043678a7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
pci: hotplug: pciehp: fix error code path in hpc_power_off_slot
PCI: Add DECLARE_PCI_DEVICE_TABLE macro
PCI: fix up error messages for pci_bus registering
PCI: fix section mismatch warning in pci_scan_child_bus
PCI: consolidate duplicated MSI enable functions
PCI: use dev_printk in quirk messages
Diffstat (limited to 'drivers/pci/hotplug-pci.c')
| -rw-r--r-- | drivers/pci/hotplug-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug-pci.c b/drivers/pci/hotplug-pci.c index a590ef682153..4d4a64478404 100644 --- a/drivers/pci/hotplug-pci.c +++ b/drivers/pci/hotplug-pci.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #include "pci.h" | 4 | #include "pci.h" |
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | unsigned int pci_do_scan_bus(struct pci_bus *bus) | 7 | unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus) |
| 8 | { | 8 | { |
| 9 | unsigned int max; | 9 | unsigned int max; |
| 10 | 10 | ||