diff options
| author | Len Brown | 2005-07-12 23:21:56 +0200 |
|---|---|---|
| committer | Len Brown | 2005-07-12 23:21:56 +0200 |
| commit | 5028770a42e7bc4d15791a44c28f0ad539323807 (patch) | |
| tree | 74800e35129775413c13ce7caf036ca19e3ce56c /include/asm-i386/pci.h | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | [ACPI] increase MAX_IO_APICS to 64 on i386 (diff) | |
| download | kernel-qcow2-linux-5028770a42e7bc4d15791a44c28f0ad539323807.tar.gz kernel-qcow2-linux-5028770a42e7bc4d15791a44c28f0ad539323807.tar.xz kernel-qcow2-linux-5028770a42e7bc4d15791a44c28f0ad539323807.zip | |
[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
Signed-off-by: Len Brown <len.brown@intel.com>
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); struct pci_bus * pcibios_scan_root(int bus); void pcibios_set_master(struct pci_dev *dev); -void pcibios_penalize_isa_irq(int irq); +void pcibios_penalize_isa_irq(int irq, int active); struct irq_routing_table *pcibios_get_irq_routing_table(void); int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); |