Merge branch 'master' into fixes

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 3d4d2075c19a..d431b0052d0c 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -322,6 +322,7 @@ static struct resource sh7780_dmae0_resources[] = {
         },
         {
                 /* Real DMA error IRQ is 38, and channel IRQs are 34-37, 44-45 */
+                .name   = "error_irq",
                 .start  = 34,
                 .end    = 34,
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,
@@ -338,6 +339,7 @@ static struct resource sh7780_dmae1_resources[] = {
         /* DMAC1 has no DMARS */
         {
                 /* Real DMA error IRQ is 38, and channel IRQs are 46-47, 92-95 */
+                .name   = "error_irq",
                 .start  = 46,
                 .end    = 46,
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,