diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /include/asm-x86_64/pci.h | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/asm-x86_64/pci.h')
| -rw-r--r-- | include/asm-x86_64/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h index c1961db88fac..eeb3088a1c9e 100644 --- a/include/asm-x86_64/pci.h +++ b/include/asm-x86_64/pci.h | |||
| @@ -33,7 +33,7 @@ extern int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int le | |||
| 33 | extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int len, u32 value); | 33 | extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int len, u32 value); |
| 34 | 34 | ||
| 35 | void pcibios_set_master(struct pci_dev *dev); | 35 | void pcibios_set_master(struct pci_dev *dev); |
| 36 | void pcibios_penalize_isa_irq(int irq); | 36 | void pcibios_penalize_isa_irq(int irq, int active); |
| 37 | struct irq_routing_table *pcibios_get_irq_routing_table(void); | 37 | struct irq_routing_table *pcibios_get_irq_routing_table(void); |
| 38 | int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); | 38 | int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); |
| 39 | 39 | ||