diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-01 15:14:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-01 15:14:04 -0400 |
| commit | 5679027e74126e0dfc860869b0e7ceab1dd06318 (patch) | |
| tree | 9a18b1a2f53be3bad8c9e4db01617fb51f067f64 /arch/arm/mach-ixp4xx/nas100d-pci.c | |
| parent | ccd0d44fad38dc1bb4b26dcc7a30e9f2c3b36870 (diff) | |
| parent | a4dd99250dc49031e6a92a895dbcc230a4832083 (diff) | |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
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 d0cea34cf61e..428d1202b799 100644 --- a/arch/arm/mach-ixp4xx/nas100d-pci.c +++ b/arch/arm/mach-ixp4xx/nas100d-pci.c | |||
| @@ -33,11 +33,11 @@ | |||
| 33 | 33 | ||
| 34 | void __init nas100d_pci_preinit(void) | 34 | void __init nas100d_pci_preinit(void) |
| 35 | { | 35 | { |
| 36 | set_irq_type(IXP4XX_GPIO_IRQ(INTA), IRQ_TYPE_LEVEL_LOW); | 36 | irq_set_irq_type(IXP4XX_GPIO_IRQ(INTA), IRQ_TYPE_LEVEL_LOW); |
| 37 | set_irq_type(IXP4XX_GPIO_IRQ(INTB), IRQ_TYPE_LEVEL_LOW); | 37 | irq_set_irq_type(IXP4XX_GPIO_IRQ(INTB), IRQ_TYPE_LEVEL_LOW); |
| 38 | set_irq_type(IXP4XX_GPIO_IRQ(INTC), IRQ_TYPE_LEVEL_LOW); | 38 | irq_set_irq_type(IXP4XX_GPIO_IRQ(INTC), IRQ_TYPE_LEVEL_LOW); |
| 39 | set_irq_type(IXP4XX_GPIO_IRQ(INTD), IRQ_TYPE_LEVEL_LOW); | 39 | irq_set_irq_type(IXP4XX_GPIO_IRQ(INTD), IRQ_TYPE_LEVEL_LOW); |
| 40 | set_irq_type(IXP4XX_GPIO_IRQ(INTE), IRQ_TYPE_LEVEL_LOW); | 40 | irq_set_irq_type(IXP4XX_GPIO_IRQ(INTE), IRQ_TYPE_LEVEL_LOW); |
| 41 | ixp4xx_pci_preinit(); | 41 | ixp4xx_pci_preinit(); |
| 42 | } | 42 | } |
| 43 | 43 | ||