diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-09-06 13:43:04 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-09-14 12:55:09 -0500 |
| commit | 617276307cd4cdb9a95c77efaa3063695af63aa7 (patch) | |
| tree | ae1ec64138ed1bec2be0a402e90724b0db31afa6 /arch/arm/mach-vexpress/v2m.c | |
| parent | 387798b37c8dd0ae24c0ac12ba456dd76865bca3 (diff) | |
| download | op-kernel-dev-617276307cd4cdb9a95c77efaa3063695af63aa7.zip op-kernel-dev-617276307cd4cdb9a95c77efaa3063695af63aa7.tar.gz | |
ARM: vexpress: convert to multi-platform
Convert vexpress to multi-platform. This always enables vexpress DT and
makes it the default v7 platform.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Diffstat (limited to 'arch/arm/mach-vexpress/v2m.c')
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 37608f2..2ca86c5 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -539,8 +539,6 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express") .restart = v2m_restart, MACHINE_END -#if defined(CONFIG_ARCH_VEXPRESS_DT) - static struct map_desc v2m_rs1_io_desc __initdata = { .virtual = V2M_PERIPH, .pfn = __phys_to_pfn(0x1c000000), @@ -671,5 +669,3 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express") .handle_irq = gic_handle_irq, .restart = v2m_restart, MACHINE_END - -#endif |
