diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
| commit | 4791d63bd40ec63c533060707dae0232b9969dc0 (patch) | |
| tree | 8e10fe91cea556c10f7d211b65c5f6bdd7ffeb55 /arch/arm/mach-ux500/cpu-db5500.c | |
| parent | b3623080ff6974e696710b6c6eb4cdbf2bbab347 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/arm/mach-ux500/cpu-db5500.c')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db5500.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c index c01bc19e3c5e..22705d246fc7 100644 --- a/arch/arm/mach-ux500/cpu-db5500.c +++ b/arch/arm/mach-ux500/cpu-db5500.c | |||
| @@ -44,6 +44,7 @@ static struct map_desc u5500_io_desc[] __initdata = { | |||
| 44 | __IO_DEV_DESC(U5500_GPIO3_BASE, SZ_4K), | 44 | __IO_DEV_DESC(U5500_GPIO3_BASE, SZ_4K), |
| 45 | __IO_DEV_DESC(U5500_GPIO4_BASE, SZ_4K), | 45 | __IO_DEV_DESC(U5500_GPIO4_BASE, SZ_4K), |
| 46 | __IO_DEV_DESC(U5500_PRCMU_BASE, SZ_4K), | 46 | __IO_DEV_DESC(U5500_PRCMU_BASE, SZ_4K), |
| 47 | __IO_DEV_DESC(U5500_PRCMU_TCDM_BASE, SZ_4K), | ||
| 47 | }; | 48 | }; |
| 48 | 49 | ||
| 49 | static struct resource db5500_pmu_resources[] = { | 50 | static struct resource db5500_pmu_resources[] = { |