| commit | e9bcd470d814473c31ffc5d09e249396a2196ad4 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Thu Jun 28 16:46:13 2012 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Thu Jun 28 16:46:13 2012 +0900 |
| tree | bf96054f235eda984473d22b90339d38430465bb | |
| parent | bc404e9128dd69654f5fda6320fc6af4ee94474c [diff] | |
| parent | ad3337cb38bf1f4c677ce2d05f9c049b35f7147e [diff] |
Merge branches 'sh/urgent' and 'sh/trivial' into sh-fixes-for-linus
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c index 158c917..43a179c 100644 --- a/arch/sh/boards/mach-kfr2r09/setup.c +++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -201,8 +201,8 @@ .flags = IORESOURCE_MEM, }, [1] = { - .start = evtirq(0xa20), - .end = evtirq(0xa20), + .start = evt2irq(0xa20), + .end = evt2irq(0xa20), .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW, }, };