diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-30 00:45:31 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-30 00:45:31 -0500 |
| commit | 01fc99864ecc678c4f1f476b2a8b64ebcb14e733 (patch) | |
| tree | 947696fdb2f76609d1a079aa6ff57a22e490d803 /arch/frv/mb93090-mb00/pci-irq.c | |
| parent | a880b11a95fab4618da412d99fc7365d723e702d (diff) | |
| parent | d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/frv/mb93090-mb00/pci-irq.c')
| -rw-r--r-- | arch/frv/mb93090-mb00/pci-irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/mb93090-mb00/pci-irq.c b/arch/frv/mb93090-mb00/pci-irq.c index af981bda015c..24622d89b1ca 100644 --- a/arch/frv/mb93090-mb00/pci-irq.c +++ b/arch/frv/mb93090-mb00/pci-irq.c | |||
| @@ -60,7 +60,7 @@ void __init pcibios_fixup_irqs(void) | |||
| 60 | } | 60 | } |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | void __init pcibios_penalize_isa_irq(int irq, int active) | 63 | void __init pcibios_penalize_isa_irq(int irq) |
| 64 | { | 64 | { |
| 65 | } | 65 | } |
| 66 | 66 | ||