diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/sh/kernel/cpu/sh4a/setup-sh7786.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7786.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c index dd5e709f9821..599022d73b28 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c | |||
| @@ -518,7 +518,7 @@ static struct resource dmac0_resources[] = { | |||
| 518 | .end = 0xfe00900b, | 518 | .end = 0xfe00900b, |
| 519 | .flags = IORESOURCE_MEM, | 519 | .flags = IORESOURCE_MEM, |
| 520 | }, { | 520 | }, { |
| 521 | /* DMA error IRQ */ | 521 | .name = "error_irq", |
| 522 | .start = evt2irq(0x5c0), | 522 | .start = evt2irq(0x5c0), |
| 523 | .end = evt2irq(0x5c0), | 523 | .end = evt2irq(0x5c0), |
| 524 | .flags = IORESOURCE_IRQ, | 524 | .flags = IORESOURCE_IRQ, |