diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 21:06:54 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 21:06:54 (GMT) |
| commit | 9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf (patch) | |
| tree | 158cd337307a4a4e09a3fb5110f29ab0136bef6c /arch/arm/mach-sa1100/generic.c | |
| parent | 4e7682d077d693e34a993ae7a2831b522930ebcb (diff) | |
| parent | 0af5e4c36e70cfd4ae96d3704a425c414f530f2a (diff) | |
| download | linux-9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf.tar.xz | |
Merge branch 'sa11x0-mcp-fixes' into fixes
Diffstat (limited to 'arch/arm/mach-sa1100/generic.c')
| -rw-r--r-- | arch/arm/mach-sa1100/generic.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index a7c0df6..bb10ee2 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c @@ -217,15 +217,10 @@ static struct platform_device sa11x0uart3_device = { static struct resource sa11x0mcp_resources[] = { [0] = { .start = __PREG(Ser4MCCR0), - .end = __PREG(Ser4MCCR0) + 0x1C - 1, + .end = __PREG(Ser4MCCR0) + 0xffff, .flags = IORESOURCE_MEM, }, [1] = { - .start = __PREG(Ser4MCCR1), - .end = __PREG(Ser4MCCR1) + 0x4 - 1, - .flags = IORESOURCE_MEM, - }, - [2] = { .start = IRQ_Ser4MCP, .end = IRQ_Ser4MCP, .flags = IORESOURCE_IRQ, |