diff options
author | Tony Lindgren <tony@atomide.com> | 2011-02-24 17:36:03 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 13:19:21 -0500 |
commit | e41cccfe794d188b0ae7f17f01692bcbc0e0dc87 (patch) | |
tree | c4c38c9738f582f93e66839ccb25347c6dadbf27 /arch/arm/mach-omap2/board-generic.c | |
parent | e0530460f6bc268b446040f1973d427d21f042d9 (diff) |
omap2+: Minimize board specific init_early calls
We should only call init_common_infrastructure and
init_common_devices from init_early.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 682da9251db6..73e3c31e8508 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -35,8 +35,6 @@ static struct omap_board_config_kernel generic_config[] = { | |||
35 | 35 | ||
36 | static void __init omap_generic_init_early(void) | 36 | static void __init omap_generic_init_early(void) |
37 | { | 37 | { |
38 | omap_board_config = generic_config; | ||
39 | omap_board_config_size = ARRAY_SIZE(generic_config); | ||
40 | omap2_init_common_infrastructure(); | 38 | omap2_init_common_infrastructure(); |
41 | omap2_init_common_devices(NULL, NULL); | 39 | omap2_init_common_devices(NULL, NULL); |
42 | } | 40 | } |
@@ -44,6 +42,8 @@ static void __init omap_generic_init_early(void) | |||
44 | static void __init omap_generic_init(void) | 42 | static void __init omap_generic_init(void) |
45 | { | 43 | { |
46 | omap_serial_init(); | 44 | omap_serial_init(); |
45 | omap_board_config = generic_config; | ||
46 | omap_board_config_size = ARRAY_SIZE(generic_config); | ||
47 | } | 47 | } |
48 | 48 | ||
49 | static void __init omap_generic_map_io(void) | 49 | static void __init omap_generic_map_io(void) |