diff options
author | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
---|---|---|
committer | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
commit | caa70ccf8cc719acb0540b558b4e075796778db8 (patch) | |
tree | e8173307b04eca62168415be04e7800bdf011f80 /arch/arm/mach-vexpress/v2m.c | |
parent | 56d667f87e81d15d43f264007322f1179ce1722e (diff) | |
parent | 3ec10cd8b526c6b10170c2649002672ee2019e73 (diff) |
Merge branch 'linux-linaro-2.6.38-master' into for-ubuntuu2
Diffstat (limited to 'arch/arm/mach-vexpress/v2m.c')
-rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index ba46e8e0743..e318df39efd 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -437,6 +437,11 @@ static void __init v2m_init(void) ct_desc->init_tile(); } +static const char *vexpress_dt_match[] __initdata = { + "arm,vexpress", + NULL, +}; + MACHINE_START(VEXPRESS, "ARM-Versatile Express") .boot_params = PLAT_PHYS_OFFSET + 0x00000100, .map_io = v2m_map_io, @@ -444,4 +449,5 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express") .init_irq = v2m_init_irq, .timer = &v2m_timer, .init_machine = v2m_init, + .dt_compat = vexpress_dt_match, MACHINE_END |