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-imx/mach-mx1ads.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-imx/mach-mx1ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx1ads.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-mx1ads.c b/arch/arm/mach-imx/mach-mx1ads.c index e8867ffd68cf..b4a5e0382634 100644 --- a/arch/arm/mach-imx/mach-mx1ads.c +++ b/arch/arm/mach-imx/mach-mx1ads.c | |||
| @@ -140,7 +140,7 @@ struct sys_timer mx1ads_timer = { | |||
| 140 | 140 | ||
| 141 | MACHINE_START(MX1ADS, "Freescale MX1ADS") | 141 | MACHINE_START(MX1ADS, "Freescale MX1ADS") |
| 142 | /* Maintainer: Sascha Hauer, Pengutronix */ | 142 | /* Maintainer: Sascha Hauer, Pengutronix */ |
| 143 | .boot_params = MX1_PHYS_OFFSET + 0x100, | 143 | .atag_offset = 0x100, |
| 144 | .map_io = mx1_map_io, | 144 | .map_io = mx1_map_io, |
| 145 | .init_early = imx1_init_early, | 145 | .init_early = imx1_init_early, |
| 146 | .init_irq = mx1_init_irq, | 146 | .init_irq = mx1_init_irq, |
| @@ -149,7 +149,7 @@ MACHINE_START(MX1ADS, "Freescale MX1ADS") | |||
| 149 | MACHINE_END | 149 | MACHINE_END |
| 150 | 150 | ||
| 151 | MACHINE_START(MXLADS, "Freescale MXLADS") | 151 | MACHINE_START(MXLADS, "Freescale MXLADS") |
| 152 | .boot_params = MX1_PHYS_OFFSET + 0x100, | 152 | .atag_offset = 0x100, |
| 153 | .map_io = mx1_map_io, | 153 | .map_io = mx1_map_io, |
| 154 | .init_early = imx1_init_early, | 154 | .init_early = imx1_init_early, |
| 155 | .init_irq = mx1_init_irq, | 155 | .init_irq = mx1_init_irq, |