From 6be15a7bf6d8b7d0c95d700e6a3369569cb75f05 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 12 Jan 2012 12:20:18 +0900 Subject: [PATCH] --- yaml --- r: 283653 b: refs/heads/master c: e64e1b11b14d363ac70fd13ab809969a6d7e42a8 h: refs/heads/master i: 283651: d54efe96c764179e3167d0fcfa286f05de14b9c1 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/setup-sh7372.c | 6 +++--- trunk/arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index afe53bffefe4..7c1c496f2593 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f40aaf6da14a4043d6361e0c7d74ada18e866059 +refs/heads/master: e64e1b11b14d363ac70fd13ab809969a6d7e42a8 diff --git a/trunk/arch/arm/mach-shmobile/setup-sh7372.c b/trunk/arch/arm/mach-shmobile/setup-sh7372.c index c197f9d29d04..1ea89be63e29 100644 --- a/trunk/arch/arm/mach-shmobile/setup-sh7372.c +++ b/trunk/arch/arm/mach-shmobile/setup-sh7372.c @@ -504,7 +504,7 @@ static struct resource sh7372_dmae0_resources[] = { .flags = IORESOURCE_MEM, }, { - /* DMA error IRQ */ + .name = "error_irq", .start = evt2irq(0x20c0), .end = evt2irq(0x20c0), .flags = IORESOURCE_IRQ, @@ -532,7 +532,7 @@ static struct resource sh7372_dmae1_resources[] = { .flags = IORESOURCE_MEM, }, { - /* DMA error IRQ */ + .name = "error_irq", .start = evt2irq(0x21c0), .end = evt2irq(0x21c0), .flags = IORESOURCE_IRQ, @@ -560,7 +560,7 @@ static struct resource sh7372_dmae2_resources[] = { .flags = IORESOURCE_MEM, }, { - /* DMA error IRQ */ + .name = "error_irq", .start = evt2irq(0x22c0), .end = evt2irq(0x22c0), .flags = IORESOURCE_IRQ, diff --git a/trunk/arch/arm/mach-shmobile/setup-sh73a0.c b/trunk/arch/arm/mach-shmobile/setup-sh73a0.c index e46821c0a62e..20e71e5cace4 100644 --- a/trunk/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/trunk/arch/arm/mach-shmobile/setup-sh73a0.c @@ -607,7 +607,7 @@ static struct resource sh73a0_dmae_resources[] = { .flags = IORESOURCE_MEM, }, { - /* DMA error IRQ */ + .name = "error_irq", .start = gic_spi(129), .end = gic_spi(129), .flags = IORESOURCE_IRQ,