diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-01 21:14:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-01 21:14:04 +0200 |
| commit | 5679027e74126e0dfc860869b0e7ceab1dd06318 (patch) | |
| tree | 9a18b1a2f53be3bad8c9e4db01617fb51f067f64 /arch/sh/cchips/hd6446x/hd64461.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/sh/cchips/hd6446x/hd64461.c')
| -rw-r--r-- | arch/sh/cchips/hd6446x/hd64461.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/cchips/hd6446x/hd64461.c b/arch/sh/cchips/hd6446x/hd64461.c index 177a10b25ca..eb4ea4d44d5 100644 --- a/arch/sh/cchips/hd6446x/hd64461.c +++ b/arch/sh/cchips/hd6446x/hd64461.c @@ -107,12 +107,12 @@ int __init setup_hd64461(void) return -EINVAL; } - set_irq_chip_and_handler(i, &hd64461_irq_chip, + irq_set_chip_and_handler(i, &hd64461_irq_chip, handle_level_irq); } - set_irq_chained_handler(CONFIG_HD64461_IRQ, hd64461_irq_demux); - set_irq_type(CONFIG_HD64461_IRQ, IRQ_TYPE_LEVEL_LOW); + irq_set_chained_handler(CONFIG_HD64461_IRQ, hd64461_irq_demux); + irq_set_irq_type(CONFIG_HD64461_IRQ, IRQ_TYPE_LEVEL_LOW); #ifdef CONFIG_HD64461_ENABLER printk(KERN_INFO "HD64461: enabling PCMCIA devices\n"); |