diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:11:34 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:11:34 -0400 |
| commit | 09fa31a322c8f03871a741cd1d26e5ca04aacbbd (patch) | |
| tree | acdad13d7c332978a91231c4f34b6320a1c7ceb6 /arch/arm/mach-imx/mach-mx31lite.c | |
| parent | 2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into highbank/soc
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31lite.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31lite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c index 4b47fd9fdd89..5242cb78b563 100644 --- a/arch/arm/mach-imx/mach-mx31lite.c +++ b/arch/arm/mach-imx/mach-mx31lite.c | |||
| @@ -280,7 +280,7 @@ struct sys_timer mx31lite_timer = { | |||
| 280 | 280 | ||
| 281 | MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM") | 281 | MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM") |
| 282 | /* Maintainer: Freescale Semiconductor, Inc. */ | 282 | /* Maintainer: Freescale Semiconductor, Inc. */ |
| 283 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 283 | .atag_offset = 0x100, |
| 284 | .map_io = mx31lite_map_io, | 284 | .map_io = mx31lite_map_io, |
| 285 | .init_early = imx31_init_early, | 285 | .init_early = imx31_init_early, |
| 286 | .init_irq = mx31_init_irq, | 286 | .init_irq = mx31_init_irq, |