summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/board-omapl138-hawk.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-08-23 10:54:51 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-08-23 10:54:51 +0100
commitad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch)
tree07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-davinci/board-omapl138-hawk.c
parent0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff)
parentaf6871683e25100813d35b3d802f1ed7b90b9f3a (diff)
downloadblackbird-op-linux-ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893.tar.gz
blackbird-op-linux-ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893.zip
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-davinci/board-omapl138-hawk.c')
-rw-r--r--arch/arm/mach-davinci/board-omapl138-hawk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index 237332a11421..c6701e4a795c 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -338,7 +338,7 @@ static void __init omapl138_hawk_map_io(void)
}
MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard")
- .boot_params = (DA8XX_DDR_BASE + 0x100),
+ .atag_offset = 0x100,
.map_io = omapl138_hawk_map_io,
.init_irq = cp_intc_init,
.timer = &davinci_timer,
OpenPOWER on IntegriCloud