diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-24 18:04:27 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-24 18:04:27 -0400 |
| commit | af1bdb79ca64ceadc7b44b11929b384eff66ce59 (patch) | |
| tree | c4bb4c94acaf44a113edc60dc0661d4282f0f100 /arch/arm/mach-mx5/board-mx51_efikasb.c | |
| parent | 552a79413a691a09abf1b3707561858422afc53c (diff) | |
| parent | 1021eb4c454312e65365a4700a1f2b33a0654aa4 (diff) | |
Merge branch 'devicetree/arm-linaro-3.1' of git://git.secretlab.ca/git/linux-2.6 into linaro-3.1linux-linaro-3.1-2011.10-2
Diffstat (limited to 'arch/arm/mach-mx5/board-mx51_efikasb.c')
| -rw-r--r-- | arch/arm/mach-mx5/board-mx51_efikasb.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c index ba5436a9fb1..dfdc011cc72 100644 --- a/arch/arm/mach-mx5/board-mx51_efikasb.c +++ b/arch/arm/mach-mx5/board-mx51_efikasb.c @@ -265,6 +265,11 @@ static struct sys_timer mx51_efikasb_timer = { .init = mx51_efikasb_timer_init, }; +static const char *mx51_efikasb_dt_match[] __initdata = { + "genesi,efikasb", + NULL +}; + MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook") .atag_offset = 0x100, .map_io = mx51_map_io, @@ -272,4 +277,5 @@ MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook") .init_irq = mx51_init_irq, .init_machine = efikasb_board_init, .timer = &mx51_efikasb_timer, + .dt_compat = mx51_efikasb_dt_match, MACHINE_END |