summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp23xx/roadrunner.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-ixp23xx/roadrunner.c
parentALSA: hda - Enable sync_write for AMD chipset with IDT 92HD8x codecs (diff)
parentALSA: hda - Fix unused warnings when !SND_HDA_NEEDS_RESUME (diff)
downloadlinux-31d44b57c508971c083ce038d7c5ededd09cea01.tar.xz
linux-31d44b57c508971c083ce038d7c5ededd09cea01.zip
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'arch/arm/mach-ixp23xx/roadrunner.c')
-rw-r--r--arch/arm/mach-ixp23xx/roadrunner.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c
index 76c61ba73218..8fe0c6273262 100644
--- a/arch/arm/mach-ixp23xx/roadrunner.c
+++ b/arch/arm/mach-ixp23xx/roadrunner.c
@@ -110,8 +110,8 @@ static int __init roadrunner_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
static void __init roadrunner_pci_preinit(void)
{
- set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
- set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
+ irq_set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
+ irq_set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
ixp23xx_pci_preinit();
}