From 35544a1d00a0d3ebeb7feff0ca8cfb8ea76e25b6 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 15 May 2012 10:26:11 +0900 Subject: [PATCH] --- yaml --- r: 305257 b: refs/heads/master c: 00d6025e58c6e3b229e28cab721c568af5b1ae05 h: refs/heads/master i: 305255: 096acfebae09a35bac73f889e7e66b881302a27d v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f79cc9b03077..14dba455a082 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd37e75ed56e3f9ddde15c57a9cbde8256221404 +refs/heads/master: 00d6025e58c6e3b229e28cab721c568af5b1ae05 diff --git a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c index 476f4747df98..5773643b8a53 100644 --- a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c +++ b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c @@ -56,7 +56,7 @@ static struct plat_sci_port scif2_platform_data = { .scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1, .scbrr_algo_id = SCBRR_ALGO_2, .type = PORT_SCIF, - .irq = SCIx_IRQ_MUXED(evt2irq(0xC40)), + .irqs = SCIx_IRQ_MUXED(evt2irq(0xC40)), }; static struct platform_device scif2_device = {