diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
| commit | 4791d63bd40ec63c533060707dae0232b9969dc0 (patch) | |
| tree | 8e10fe91cea556c10f7d211b65c5f6bdd7ffeb55 /arch/arm/mach-omap2/board-3630sdp.c | |
| parent | b3623080ff6974e696710b6c6eb4cdbf2bbab347 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/arm/mach-omap2/board-3630sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-3630sdp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index a5933cc15caa..e4f37b57a0c4 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c | |||
| @@ -219,7 +219,7 @@ MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board") | |||
| 219 | .reserve = omap_reserve, | 219 | .reserve = omap_reserve, |
| 220 | .map_io = omap3_map_io, | 220 | .map_io = omap3_map_io, |
| 221 | .init_early = omap_sdp_init_early, | 221 | .init_early = omap_sdp_init_early, |
| 222 | .init_irq = omap_init_irq, | 222 | .init_irq = omap3_init_irq, |
| 223 | .init_machine = omap_sdp_init, | 223 | .init_machine = omap_sdp_init, |
| 224 | .timer = &omap_timer, | 224 | .timer = &omap3_timer, |
| 225 | MACHINE_END | 225 | MACHINE_END |