diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /arch/arm/mach-ixp4xx/nas100d-pci.c | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-ixp4xx/nas100d-pci.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nas100d-pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c index b8ebaf4a9c8e..1088426fdcee 100644 --- a/arch/arm/mach-ixp4xx/nas100d-pci.c +++ b/arch/arm/mach-ixp4xx/nas100d-pci.c | |||
| @@ -24,11 +24,11 @@ | |||
| 24 | 24 | ||
| 25 | void __init nas100d_pci_preinit(void) | 25 | void __init nas100d_pci_preinit(void) |
| 26 | { | 26 | { |
| 27 | set_irq_type(IRQ_NAS100D_PCI_INTA, IRQT_LOW); | 27 | set_irq_type(IRQ_NAS100D_PCI_INTA, IRQ_TYPE_LEVEL_LOW); |
| 28 | set_irq_type(IRQ_NAS100D_PCI_INTB, IRQT_LOW); | 28 | set_irq_type(IRQ_NAS100D_PCI_INTB, IRQ_TYPE_LEVEL_LOW); |
| 29 | set_irq_type(IRQ_NAS100D_PCI_INTC, IRQT_LOW); | 29 | set_irq_type(IRQ_NAS100D_PCI_INTC, IRQ_TYPE_LEVEL_LOW); |
| 30 | set_irq_type(IRQ_NAS100D_PCI_INTD, IRQT_LOW); | 30 | set_irq_type(IRQ_NAS100D_PCI_INTD, IRQ_TYPE_LEVEL_LOW); |
| 31 | set_irq_type(IRQ_NAS100D_PCI_INTE, IRQT_LOW); | 31 | set_irq_type(IRQ_NAS100D_PCI_INTE, IRQ_TYPE_LEVEL_LOW); |
| 32 | 32 | ||
| 33 | ixp4xx_pci_preinit(); | 33 | ixp4xx_pci_preinit(); |
| 34 | } | 34 | } |