diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /arch/arm/mach-omap2/board-generic.c | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 90938151bcf1..df8be081e159 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
| @@ -65,6 +65,7 @@ static void __init omap_generic_init(void) | |||
| 65 | 65 | ||
| 66 | static void __init omap_generic_map_io(void) | 66 | static void __init omap_generic_map_io(void) |
| 67 | { | 67 | { |
| 68 | omap2_set_globals_242x(); /* should be 242x, 243x, or 343x */ | ||
| 68 | omap2_map_common_io(); | 69 | omap2_map_common_io(); |
| 69 | } | 70 | } |
| 70 | 71 | ||