diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
| commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
| tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /include/asm-i386/pci.h | |
| parent | 55ee3b8365fd5d301b9076eea739146f2b91e82c (diff) | |
| parent | 5028770a42e7bc4d15791a44c28f0ad539323807 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'include/asm-i386/pci.h')
| -rw-r--r-- | include/asm-i386/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h index 3561899eb826..78c85985aee3 100644 --- a/include/asm-i386/pci.h +++ b/include/asm-i386/pci.h | |||
| @@ -27,7 +27,7 @@ void pcibios_config_init(void); | |||
| 27 | struct pci_bus * pcibios_scan_root(int bus); | 27 | struct pci_bus * pcibios_scan_root(int bus); |
| 28 | 28 | ||
| 29 | void pcibios_set_master(struct pci_dev *dev); | 29 | void pcibios_set_master(struct pci_dev *dev); |
| 30 | void pcibios_penalize_isa_irq(int irq); | 30 | void pcibios_penalize_isa_irq(int irq, int active); |
| 31 | struct irq_routing_table *pcibios_get_irq_routing_table(void); | 31 | struct irq_routing_table *pcibios_get_irq_routing_table(void); |
| 32 | int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); | 32 | int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); |
| 33 | 33 | ||