diff options
author | 2010-05-03 08:28:05 +0100 | |
---|---|---|
committer | 2010-05-04 17:50:05 +0100 | |
commit | 41ac329f607add059ae8b063375c5d9d6e7471cf (patch) | |
tree | b8e33a20cbac44e3f8cecef764e55b1d9ba7e311 /arch/arm/mach-ux500/include | |
parent | ARM: 6086/1: ux500: move gpio devices to devices-db8500.c (diff) | |
download | linux-dev-41ac329f607add059ae8b063375c5d9d6e7471cf.tar.xz linux-dev-41ac329f607add059ae8b063375c5d9d6e7471cf.zip |
ARM: 6087/1: ux500: move sys_timer to cpu.c
Move the common system timer setup code to cpu.c.
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ux500/include')
-rw-r--r-- | arch/arm/mach-ux500/include/mach/setup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/include/mach/setup.h b/arch/arm/mach-ux500/include/mach/setup.h index 6187effe92db..c730d078f9ab 100644 --- a/arch/arm/mach-ux500/include/mach/setup.h +++ b/arch/arm/mach-ux500/include/mach/setup.h @@ -27,7 +27,7 @@ extern void nmdk_timer_init(void); extern void __init amba_add_devices(struct amba_device *devs[], int num); struct sys_timer; -extern struct sys_timer u8500_timer; +extern struct sys_timer ux500_timer; #define __IO_DEV_DESC(x, sz) { \ .virtual = IO_ADDRESS(x), \ |