diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
| commit | 5028770a42e7bc4d15791a44c28f0ad539323807 (patch) | |
| tree | 74800e35129775413c13ce7caf036ca19e3ce56c /include/asm-m68k | |
| parent | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff) | |
| parent | d8683a0cb5d09cb7f19feefa708424a84577e68f (diff) | |
[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-m68k')
| -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 | } |