aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop32x/glantank.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 09:23:28 -0400
committerArnd Bergmann <arnd@arndb.de>2011-10-31 09:23:28 -0400
commit929f58aeeb46f964d9468ce1addd993f5d92b11d (patch)
tree95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-iop32x/glantank.c
parentfcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff)
parenta26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff)
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-iop32x/glantank.c')
-rw-r--r--arch/arm/mach-iop32x/glantank.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c
index ceef5d4dce1a..0edc88020577 100644
--- a/arch/arm/mach-iop32x/glantank.c
+++ b/arch/arm/mach-iop32x/glantank.c
@@ -207,7 +207,7 @@ static void __init glantank_init_machine(void)
207 207
208MACHINE_START(GLANTANK, "GLAN Tank") 208MACHINE_START(GLANTANK, "GLAN Tank")
209 /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ 209 /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
210 .boot_params = 0xa0000100, 210 .atag_offset = 0x100,
211 .map_io = glantank_map_io, 211 .map_io = glantank_map_io,
212 .init_irq = iop32x_init_irq, 212 .init_irq = iop32x_init_irq,
213 .timer = &glantank_timer, 213 .timer = &glantank_timer,