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/plat-samsung/include/plat/s5p-time.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/plat-samsung/include/plat/s5p-time.h')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/s5p-time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/include/plat/s5p-time.h b/arch/arm/plat-samsung/include/plat/s5p-time.h index 3a70aebc9205..9c96f3586ce0 100644 --- a/arch/arm/plat-samsung/include/plat/s5p-time.h +++ b/arch/arm/plat-samsung/include/plat/s5p-time.h | |||
| @@ -36,5 +36,5 @@ struct s5p_timer_source { | |||
| 36 | 36 | ||
| 37 | extern void __init s5p_set_timer_source(enum s5p_timer_mode event, | 37 | extern void __init s5p_set_timer_source(enum s5p_timer_mode event, |
| 38 | enum s5p_timer_mode source); | 38 | enum s5p_timer_mode source); |
| 39 | extern struct sys_timer s5p_timer; | 39 | extern void s5p_timer_init(void); |
| 40 | #endif /* __ASM_PLAT_S5P_TIME_H */ | 40 | #endif /* __ASM_PLAT_S5P_TIME_H */ |