diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 09:07:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 09:07:54 -0400 |
| commit | a403e45c3b678211ee3b7225dbb924921fb5ddd3 (patch) | |
| tree | 6526d8d3c46f2443c7836bf094366179a57e7aad /arch/arm/mach-ixp4xx/dsmg600-pci.c | |
| parent | a05d2ebab28011c2f3f520833f4bfdd2fd1b9c02 (diff) | |
| parent | d974ae379a2fbe8948f01eabbc6b19c0a80f09bc (diff) | |
Merge core/lib: pick up memparse() change.
Merge branch 'core/lib' into x86/xen
Diffstat (limited to 'arch/arm/mach-ixp4xx/dsmg600-pci.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/dsmg600-pci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-ixp4xx/dsmg600-pci.c b/arch/arm/mach-ixp4xx/dsmg600-pci.c index 9db7e1f42011..926d15f885fb 100644 --- a/arch/arm/mach-ixp4xx/dsmg600-pci.c +++ b/arch/arm/mach-ixp4xx/dsmg600-pci.c | |||
| @@ -25,12 +25,12 @@ | |||
| 25 | 25 | ||
| 26 | void __init dsmg600_pci_preinit(void) | 26 | void __init dsmg600_pci_preinit(void) |
| 27 | { | 27 | { |
| 28 | set_irq_type(IRQ_DSMG600_PCI_INTA, IRQT_LOW); | 28 | set_irq_type(IRQ_DSMG600_PCI_INTA, IRQ_TYPE_LEVEL_LOW); |
| 29 | set_irq_type(IRQ_DSMG600_PCI_INTB, IRQT_LOW); | 29 | set_irq_type(IRQ_DSMG600_PCI_INTB, IRQ_TYPE_LEVEL_LOW); |
| 30 | set_irq_type(IRQ_DSMG600_PCI_INTC, IRQT_LOW); | 30 | set_irq_type(IRQ_DSMG600_PCI_INTC, IRQ_TYPE_LEVEL_LOW); |
| 31 | set_irq_type(IRQ_DSMG600_PCI_INTD, IRQT_LOW); | 31 | set_irq_type(IRQ_DSMG600_PCI_INTD, IRQ_TYPE_LEVEL_LOW); |
| 32 | set_irq_type(IRQ_DSMG600_PCI_INTE, IRQT_LOW); | 32 | set_irq_type(IRQ_DSMG600_PCI_INTE, IRQ_TYPE_LEVEL_LOW); |
| 33 | set_irq_type(IRQ_DSMG600_PCI_INTF, IRQT_LOW); | 33 | set_irq_type(IRQ_DSMG600_PCI_INTF, IRQ_TYPE_LEVEL_LOW); |
| 34 | 34 | ||
| 35 | ixp4xx_pci_preinit(); | 35 | ixp4xx_pci_preinit(); |
| 36 | } | 36 | } |