diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:28 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:28 +0100 |
commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-omap2/board-ti8168evm.c | |
parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
download | talos-obmc-linux-929f58aeeb46f964d9468ce1addd993f5d92b11d.tar.gz talos-obmc-linux-929f58aeeb46f964d9468ce1addd993f5d92b11d.zip |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-omap2/board-ti8168evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-ti8168evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-ti8168evm.c b/arch/arm/mach-omap2/board-ti8168evm.c index a85d5b0b11da..e41958acb6b6 100644 --- a/arch/arm/mach-omap2/board-ti8168evm.c +++ b/arch/arm/mach-omap2/board-ti8168evm.c @@ -48,7 +48,7 @@ static void __init ti8168_evm_map_io(void) MACHINE_START(TI8168EVM, "ti8168evm") /* Maintainer: Texas Instruments */ - .boot_params = 0x80000100, + .atag_offset = 0x100, .map_io = ti8168_evm_map_io, .init_early = ti8168_init_early, .init_irq = ti816x_init_irq, |