diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-imx/mach-scb9328.c | |
| parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
| parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-imx/mach-scb9328.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-scb9328.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-scb9328.c b/arch/arm/mach-imx/mach-scb9328.c index db2d60470e15..85d32845ee1e 100644 --- a/arch/arm/mach-imx/mach-scb9328.c +++ b/arch/arm/mach-imx/mach-scb9328.c | |||
| @@ -137,7 +137,7 @@ static struct sys_timer scb9328_timer = { | |||
| 137 | 137 | ||
| 138 | MACHINE_START(SCB9328, "Synertronixx scb9328") | 138 | MACHINE_START(SCB9328, "Synertronixx scb9328") |
| 139 | /* Sascha Hauer */ | 139 | /* Sascha Hauer */ |
| 140 | .boot_params = 0x08000100, | 140 | .atag_offset = 100, |
| 141 | .map_io = mx1_map_io, | 141 | .map_io = mx1_map_io, |
| 142 | .init_early = imx1_init_early, | 142 | .init_early = imx1_init_early, |
| 143 | .init_irq = mx1_init_irq, | 143 | .init_irq = mx1_init_irq, |