diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-10 23:37:21 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-10 23:37:21 +0000 |
commit | 65f69e5c16f8eee17b7f71bfad9e8e58f44c7386 (patch) | |
tree | 0bfc3b13f311387b9fc12db2cb44fea3713d2708 /arch/arm/mach-realview/realview_eb.c | |
parent | cc20d42986d5807cbe4f5c7c8e3dab2e59ea0db3 (diff) | |
parent | c97c5aa83c41a532bc67da356d77da929bc41b9c (diff) | |
download | op-kernel-dev-65f69e5c16f8eee17b7f71bfad9e8e58f44c7386.zip op-kernel-dev-65f69e5c16f8eee17b7f71bfad9e8e58f44c7386.tar.gz |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/arm/mach-realview/realview_eb.c')
-rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index 1d65e64..917f8ca 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c @@ -415,6 +415,7 @@ MACHINE_START(REALVIEW_EB, "ARM-RealView EB") .phys_io = REALVIEW_EB_UART0_BASE, .io_pg_offst = (IO_ADDRESS(REALVIEW_EB_UART0_BASE) >> 18) & 0xfffc, .boot_params = PHYS_OFFSET + 0x00000100, + .fixup = realview_fixup, .map_io = realview_eb_map_io, .init_irq = gic_init_irq, .timer = &realview_eb_timer, |