Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

[~andy/linux] / arch / sh / boards / board-sh7785lcr.c

diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c
index d0d6221d7c2eaef908b4804848c442923c970b21..2c4771ee84cd3e71f90733ea5c1833ddaa338f72 100644 (file)
--- a/arch/sh/boards/board-sh7785lcr.c
+++ b/arch/sh/boards/board-sh7785lcr.c
@@ -20,6 +20,7 @@
 #include <linux/i2c-pca-platform.h>
 #include <linux/i2c-algo-pca.h>
 #include <linux/usb/r8a66597.h>
+#include <linux/sh_intc.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/clk.h>
@@ -105,8 +106,8 @@ static struct resource r8a66597_usb_host_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 2,
-               .end    = 2,
+               .start  = evt2irq(0x240),
+               .end    = evt2irq(0x240),
                .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
        },
 };
@@ -135,7 +136,7 @@ static struct resource sm501_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [2]     = {
-               .start  = 10,
+               .start  = evt2irq(0x340),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -223,8 +224,8 @@ static struct resource i2c_proto_resources[] = {
                .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8BIT,
        },
        [1] = {
-               .start  = 12,
-               .end    = 12,
+               .start  = evt2irq(0x380),
+               .end    = evt2irq(0x380),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -236,8 +237,8 @@ static struct resource i2c_resources[] = {
                .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8BIT,
        },
        [1] = {
-               .start  = 12,
-               .end    = 12,
+               .start  = evt2irq(0x380),
+               .end    = evt2irq(0x380),
                .flags  = IORESOURCE_IRQ,
        },
 };