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/kernel/cpu/irq/imask.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/kernel/cpu/irq/imask.c')
| -rw-r--r-- | arch/sh/kernel/cpu/irq/imask.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/irq/imask.c b/arch/sh/kernel/cpu/irq/imask.c index 32c825c9488..39b6a24c159 100644 --- a/arch/sh/kernel/cpu/irq/imask.c +++ b/arch/sh/kernel/cpu/irq/imask.c @@ -80,6 +80,6 @@ static struct irq_chip imask_irq_chip = { void make_imask_irq(unsigned int irq) { - set_irq_chip_and_handler_name(irq, &imask_irq_chip, - handle_level_irq, "level"); + irq_set_chip_and_handler_name(irq, &imask_irq_chip, handle_level_irq, + "level"); } |