diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /arch/arm/mach-ixp4xx/nslu2-pci.c | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/arm/mach-ixp4xx/nslu2-pci.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c index 04661fef97f5..4429b8448b61 100644 --- a/arch/arm/mach-ixp4xx/nslu2-pci.c +++ b/arch/arm/mach-ixp4xx/nslu2-pci.c | |||
| @@ -24,9 +24,9 @@ | |||
| 24 | 24 | ||
| 25 | void __init nslu2_pci_preinit(void) | 25 | void __init nslu2_pci_preinit(void) |
| 26 | { | 26 | { |
| 27 | set_irq_type(IRQ_NSLU2_PCI_INTA, IRQT_LOW); | 27 | set_irq_type(IRQ_NSLU2_PCI_INTA, IRQ_TYPE_LEVEL_LOW); |
| 28 | set_irq_type(IRQ_NSLU2_PCI_INTB, IRQT_LOW); | 28 | set_irq_type(IRQ_NSLU2_PCI_INTB, IRQ_TYPE_LEVEL_LOW); |
| 29 | set_irq_type(IRQ_NSLU2_PCI_INTC, IRQT_LOW); | 29 | set_irq_type(IRQ_NSLU2_PCI_INTC, IRQ_TYPE_LEVEL_LOW); |
| 30 | 30 | ||
| 31 | ixp4xx_pci_preinit(); | 31 | ixp4xx_pci_preinit(); |
| 32 | } | 32 | } |