diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:32:24 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:32:24 -0500 |
commit | 808601b75804475c9022f6375e76b7c62c99a10a (patch) | |
tree | 355a3100269e88460e36f251ef0ce2f1ed88d52e /arch/arm/mach-omap2/board-overo.c | |
parent | c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (diff) | |
parent | f17f9726c27c3921e00a5750e85070e6dd7e1ff7 (diff) |
Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-overo.c')
-rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index b75bdcd47117..cb26e5d8268d 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
@@ -413,8 +413,9 @@ static void __init overo_init_irq(void) | |||
413 | { | 413 | { |
414 | omap_board_config = overo_config; | 414 | omap_board_config = overo_config; |
415 | omap_board_config_size = ARRAY_SIZE(overo_config); | 415 | omap_board_config_size = ARRAY_SIZE(overo_config); |
416 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, | 416 | omap2_init_common_infrastructure(); |
417 | mt46h32m32lf6_sdrc_params); | 417 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, |
418 | mt46h32m32lf6_sdrc_params); | ||
418 | omap_init_irq(); | 419 | omap_init_irq(); |
419 | } | 420 | } |
420 | 421 | ||