diff options
| author | Lachlan McIlroy <[email protected]> | 2008-02-26 03:26:14 +0000 |
|---|---|---|
| committer | Lachlan McIlroy <[email protected]> | 2008-02-26 03:26:14 +0000 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /arch/x86/pci/common.c | |
| parent | Remove empty file fs/xfs/Makefile-linux-2.6. (diff) | |
| parent | Linux 2.6.25-rc3 (diff) | |
| download | kernel-91e229bbad6524aabaac8717b2f559283670c37a.tar.gz kernel-91e229bbad6524aabaac8717b2f559283670c37a.zip | |
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) pcibios_disable_irq(dev); } -struct pci_bus *pci_scan_bus_with_sysdata(int busno) +struct pci_bus *__devinit pci_scan_bus_with_sysdata(int busno) { struct pci_bus *bus = NULL; struct pci_sysdata *sd; |