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-omap2/board-omap4panda.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-omap2/board-omap4panda.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 683bede73d5..124cf21a221 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -581,6 +581,11 @@ static void __init omap4_panda_map_io(void) omap44xx_map_common_io(); } +static const char *omap4_panda_match[] = { + "ti,omap4-panda", + NULL, +}; + MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board") /* Maintainer: David Anders - Texas Instruments Inc */ .atag_offset = 0x100, @@ -590,4 +595,5 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board") .init_irq = gic_init_irq, .init_machine = omap4_panda_init, .timer = &omap4_timer, + .dt_compat = omap4_panda_match, MACHINE_END |