diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
| commit | 71f2c153755442c05d15cd025484f676a5f3541f (patch) | |
| tree | fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-omap2/board-cm-t35.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t35.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index e15d39bffe79..5665e688bd26 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
| @@ -629,7 +629,7 @@ static void __init cm_t3730_init(void) | |||
| 629 | } | 629 | } |
| 630 | 630 | ||
| 631 | MACHINE_START(CM_T35, "Compulab CM-T35") | 631 | MACHINE_START(CM_T35, "Compulab CM-T35") |
| 632 | .boot_params = 0x80000100, | 632 | .atag_offset = 0x100, |
| 633 | .reserve = omap_reserve, | 633 | .reserve = omap_reserve, |
| 634 | .map_io = omap3_map_io, | 634 | .map_io = omap3_map_io, |
| 635 | .init_early = omap35xx_init_early, | 635 | .init_early = omap35xx_init_early, |
| @@ -639,7 +639,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35") | |||
| 639 | MACHINE_END | 639 | MACHINE_END |
| 640 | 640 | ||
| 641 | MACHINE_START(CM_T3730, "Compulab CM-T3730") | 641 | MACHINE_START(CM_T3730, "Compulab CM-T3730") |
| 642 | .boot_params = 0x80000100, | 642 | .atag_offset = 0x100, |
| 643 | .reserve = omap_reserve, | 643 | .reserve = omap_reserve, |
| 644 | .map_io = omap3_map_io, | 644 | .map_io = omap3_map_io, |
| 645 | .init_early = omap3630_init_early, | 645 | .init_early = omap3630_init_early, |