diff options
author | David Shaohua Li <shaohua.li@intel.com> | 2005-04-01 00:07:31 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-07-12 00:03:30 -0400 |
commit | c9c3e457de24cca2ca688fa397d93a241f472048 (patch) | |
tree | 570b7a07f9c6f570341481500a2bff21c1328d8d /include/asm-m68k/pci.h | |
parent | acf05f4b7f558051ea0028e8e617144123650272 (diff) |
[ACPI] PNPACPI vs sound IRQ
http://bugme.osdl.org/show_bug.cgi?id=4016
Written-by: David Shaohua Li <shaohua.li@intel.com>
Acked-by: Adam Belay <abelay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/asm-m68k/pci.h')
-rw-r--r-- | include/asm-m68k/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/pci.h b/include/asm-m68k/pci.h index 9e7d79ab5d13..9d2c07abe44f 100644 --- a/include/asm-m68k/pci.h +++ b/include/asm-m68k/pci.h | |||
@@ -43,7 +43,7 @@ static inline void pcibios_set_master(struct pci_dev *dev) | |||
43 | /* No special bus mastering setup handling */ | 43 | /* No special bus mastering setup handling */ |
44 | } | 44 | } |
45 | 45 | ||
46 | static inline void pcibios_penalize_isa_irq(int irq) | 46 | static inline void pcibios_penalize_isa_irq(int irq, int active) |
47 | { | 47 | { |
48 | /* We don't do dynamic PCI IRQ allocation */ | 48 | /* We don't do dynamic PCI IRQ allocation */ |
49 | } | 49 | } |