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-m68k/pci.h | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
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 | } |