diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 10:13:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 10:13:24 -0700 |
commit | 01a6a7790e8e466584fc845f3cfc1770ffa1fee5 (patch) | |
tree | 92183acab5a93d86836faf9554f04119f44e0dcb /arch/i386/pci/pcbios.c | |
parent | ae292dbd2e9385d4c63f0c7099ab73b60d1b26d3 (diff) | |
parent | 99fa9844f0eed5582b5648f745204758b27db659 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: irq and pci_ids patch for Intel Tolapai
PCI: unhide SMBus on Compaq Deskpro EP 401963-001 motherboard
PCI: Remove __devinit from pcibios_get_irq_routing_table
PCI: remove devinit from pci_read_bridge_bases
PCI AER: fix warnings when PCIEAER=n
Diffstat (limited to 'arch/i386/pci/pcbios.c')
-rw-r--r-- | arch/i386/pci/pcbios.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c index 5f5193401be..10ac8c316c4 100644 --- a/arch/i386/pci/pcbios.c +++ b/arch/i386/pci/pcbios.c @@ -412,7 +412,7 @@ struct irq_routing_options { u16 segment; } __attribute__((packed)); -struct irq_routing_table * __devinit pcibios_get_irq_routing_table(void) +struct irq_routing_table * pcibios_get_irq_routing_table(void) { struct irq_routing_options opt; struct irq_routing_table *rt = NULL; |