diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-28 08:03:23 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-28 08:03:34 +0100 |
| commit | 66eae035dc59755c51ad3b3c718a5ed7535322e3 (patch) | |
| tree | a30f914378e8c72c2885d2d53551d6e3fbf4bd6d /arch/arm/mach-spear3xx/include/mach | |
| parent | Merge branch 'vt8500/wm8x50' into next/soc (diff) | |
| parent | Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into... (diff) | |
| download | linux-66eae035dc59755c51ad3b3c718a5ed7535322e3.tar.xz linux-66eae035dc59755c51ad3b3c718a5ed7535322e3.zip | |
Merge branch 'depends/cleanup' into next/soc
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-spear3xx/include/mach')
| -rw-r--r-- | arch/arm/mach-spear3xx/include/mach/generic.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h index ce19113ca791..df310799e416 100644 --- a/arch/arm/mach-spear3xx/include/mach/generic.h +++ b/arch/arm/mach-spear3xx/include/mach/generic.h @@ -22,7 +22,7 @@ #include <asm/mach/map.h> /* Add spear3xx family device structure declarations here */ -extern struct sys_timer spear3xx_timer; +extern void spear3xx_timer_init(void); extern struct pl022_ssp_controller pl022_plat_data; extern struct pl08x_platform_data pl080_plat_data; @@ -30,7 +30,6 @@ extern struct pl08x_platform_data pl080_plat_data; void __init spear_setup_of_timer(void); void __init spear3xx_clk_init(void); void __init spear3xx_map_io(void); -void __init spear3xx_dt_init_irq(void); void spear_restart(char, const char *); |