summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx/nas100d-pci.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-04-26 15:05:39 +0200
committerTakashi Iwai <tiwai@suse.de>2011-04-26 15:05:39 +0200
commit31d44b57c508971c083ce038d7c5ededd09cea01 (patch)
tree249689625896d65894f56763c22f726e39fde5ec /arch/arm/mach-ixp4xx/nas100d-pci.c
parent885f42e1f466c36e3663d912a831e940f01a112b (diff)
parent1c7276cfc04b1a5b296b691c2e07297a4f6c19aa (diff)
downloadblackbird-obmc-linux-31d44b57c508971c083ce038d7c5ededd09cea01.tar.gz
blackbird-obmc-linux-31d44b57c508971c083ce038d7c5ededd09cea01.zip
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'arch/arm/mach-ixp4xx/nas100d-pci.c')
-rw-r--r--arch/arm/mach-ixp4xx/nas100d-pci.c10
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 @@
void __init nas100d_pci_preinit(void)
{
- set_irq_type(IXP4XX_GPIO_IRQ(INTA), IRQ_TYPE_LEVEL_LOW);
- set_irq_type(IXP4XX_GPIO_IRQ(INTB), IRQ_TYPE_LEVEL_LOW);
- set_irq_type(IXP4XX_GPIO_IRQ(INTC), IRQ_TYPE_LEVEL_LOW);
- set_irq_type(IXP4XX_GPIO_IRQ(INTD), IRQ_TYPE_LEVEL_LOW);
- set_irq_type(IXP4XX_GPIO_IRQ(INTE), IRQ_TYPE_LEVEL_LOW);
+ irq_set_irq_type(IXP4XX_GPIO_IRQ(INTA), IRQ_TYPE_LEVEL_LOW);
+ irq_set_irq_type(IXP4XX_GPIO_IRQ(INTB), IRQ_TYPE_LEVEL_LOW);
+ irq_set_irq_type(IXP4XX_GPIO_IRQ(INTC), IRQ_TYPE_LEVEL_LOW);
+ irq_set_irq_type(IXP4XX_GPIO_IRQ(INTD), IRQ_TYPE_LEVEL_LOW);
+ irq_set_irq_type(IXP4XX_GPIO_IRQ(INTE), IRQ_TYPE_LEVEL_LOW);
ixp4xx_pci_preinit();
}
OpenPOWER on IntegriCloud