diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /arch/x86/pci/common.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/x86/pci/common.c')
| -rw-r--r-- | arch/x86/pci/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index b7c67a187b6b..7b6e3bb9b28c 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
| @@ -541,7 +541,7 @@ void pcibios_disable_device (struct pci_dev *dev) | |||
| 541 | pcibios_disable_irq(dev); | 541 | pcibios_disable_irq(dev); |
| 542 | } | 542 | } |
| 543 | 543 | ||
| 544 | struct pci_bus *pci_scan_bus_with_sysdata(int busno) | 544 | struct pci_bus *__devinit pci_scan_bus_with_sysdata(int busno) |
| 545 | { | 545 | { |
| 546 | struct pci_bus *bus = NULL; | 546 | struct pci_bus *bus = NULL; |
| 547 | struct pci_sysdata *sd; | 547 | struct pci_sysdata *sd; |