diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 12:54:15 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 12:54:15 -0500 |
| commit | 7266d48fca8ee2a15d15222c41f887e10db54c5a (patch) | |
| tree | 775404bcbf8ce146ccaba905e841a3621ae7ce80 /arch/arm/mach-prima2/common.h | |
| parent | 168268a225d24da3768a88c1029fb3014b0837ca (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
Merge branch 'timer/cleanup' into late/mvebu2
Basing the mvebu patches on top of the timer cleanup
avoids some nasty merges.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-prima2/common.h')
| -rw-r--r-- | arch/arm/mach-prima2/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-prima2/common.h b/arch/arm/mach-prima2/common.h index 60d826fc2185..9c75f124e3cf 100644 --- a/arch/arm/mach-prima2/common.h +++ b/arch/arm/mach-prima2/common.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <asm/mach/time.h> | 13 | #include <asm/mach/time.h> |
| 14 | 14 | ||
| 15 | extern struct sys_timer sirfsoc_timer; | 15 | extern void sirfsoc_timer_init(void); |
| 16 | 16 | ||
| 17 | extern void __init sirfsoc_of_irq_init(void); | 17 | extern void __init sirfsoc_of_irq_init(void); |
| 18 | extern void __init sirfsoc_of_clk_init(void); | 18 | extern void __init sirfsoc_of_clk_init(void); |