summaryrefslogtreecommitdiffstats
path: root/drivers/parisc/eisa.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-04-09 10:05:30 +0200
committerTakashi Iwai <tiwai@suse.de>2011-04-09 10:05:30 +0200
commit664cee46e755b37204f1731cb8726db610f3486d (patch)
tree11ed0d43eff14123534785cf25c0a2143e134e7e /drivers/parisc/eisa.c
parenta0334c50bf0ba7c720ed00f931e721c989efd233 (diff)
parent4e29402fe4b2006c994eed5020c42b2cc87d9b42 (diff)
downloadop-kernel-dev-664cee46e755b37204f1731cb8726db610f3486d.zip
op-kernel-dev-664cee46e755b37204f1731cb8726db610f3486d.tar.gz
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'drivers/parisc/eisa.c')
-rw-r--r--drivers/parisc/eisa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index deeec32..103095b 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -340,7 +340,7 @@ static int __init eisa_probe(struct parisc_device *dev)
/* Reserve IRQ2 */
setup_irq(2, &irq2_action);
for (i = 0; i < 16; i++) {
- set_irq_chip_and_handler(i, &eisa_interrupt_type,
+ irq_set_chip_and_handler(i, &eisa_interrupt_type,
handle_simple_irq);
}
OpenPOWER on IntegriCloud