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-mx27ads.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-imx/mach-mx27ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx27ads.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c index fc26ed71b9ed..efe6109099fd 100644 --- a/arch/arm/mach-imx/mach-mx27ads.c +++ b/arch/arm/mach-imx/mach-mx27ads.c | |||
| @@ -345,7 +345,7 @@ static void __init mx27ads_map_io(void) | |||
| 345 | 345 | ||
| 346 | MACHINE_START(MX27ADS, "Freescale i.MX27ADS") | 346 | MACHINE_START(MX27ADS, "Freescale i.MX27ADS") |
| 347 | /* maintainer: Freescale Semiconductor, Inc. */ | 347 | /* maintainer: Freescale Semiconductor, Inc. */ |
| 348 | .boot_params = MX27_PHYS_OFFSET + 0x100, | 348 | .atag_offset = 0x100, |
| 349 | .map_io = mx27ads_map_io, | 349 | .map_io = mx27ads_map_io, |
| 350 | .init_early = imx27_init_early, | 350 | .init_early = imx27_init_early, |
| 351 | .init_irq = mx27_init_irq, | 351 | .init_irq = mx27_init_irq, |