diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /include/asm-ia64/pci.h | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'include/asm-ia64/pci.h')
| -rw-r--r-- | include/asm-ia64/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h index 0c4c5d801d3f..f11771eadc48 100644 --- a/include/asm-ia64/pci.h +++ b/include/asm-ia64/pci.h | |||
| @@ -47,7 +47,7 @@ pcibios_set_master (struct pci_dev *dev) | |||
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | static inline void | 49 | static inline void |
| 50 | pcibios_penalize_isa_irq (int irq) | 50 | pcibios_penalize_isa_irq (int irq, int active) |
| 51 | { | 51 | { |
| 52 | /* We don't do dynamic PCI IRQ allocation */ | 52 | /* We don't do dynamic PCI IRQ allocation */ |
| 53 | } | 53 | } |