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-generic.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-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index b1c2c9a11c38..0e3d81e09f89 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
| @@ -37,7 +37,8 @@ static void __init omap_generic_init_irq(void) | |||
| 37 | { | 37 | { |
| 38 | omap_board_config = generic_config; | 38 | omap_board_config = generic_config; |
| 39 | omap_board_config_size = ARRAY_SIZE(generic_config); | 39 | omap_board_config_size = ARRAY_SIZE(generic_config); |
| 40 | omap2_init_common_hw(NULL, NULL); | 40 | omap2_init_common_infrastructure(); |
| 41 | omap2_init_common_devices(NULL, NULL); | ||
| 41 | omap_init_irq(); | 42 | omap_init_irq(); |
| 42 | } | 43 | } |
| 43 | 44 | ||