diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
| commit | 6715930654e06c4d2e66e718ea159079f71838f4 (patch) | |
| tree | 6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /arch/arm/mach-omap2/board-generic.c | |
| parent | ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff) | |
| parent | e490517a039a99d692cb3a5561941b0a5f576172 (diff) | |
Merge commit 'linus/master' into sched-fixes-for-linus
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 | ||