diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-03 13:47:59 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-03 13:47:59 -0400 |
| commit | 7f585bbfc54fec9dcf387fd2edb2d6f4908badf8 (patch) | |
| tree | fd79064e390217a56f77c5cd8236c0db6f8d9528 /arch/arm/mach-omap2/common.h | |
| parent | 43231b5be657fde1c4ced180d829bbd59ceef9ad (diff) | |
| parent | 4615943cf3a531bc76f589c22bd366da092b7c0f (diff) | |
Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer
Conflicts:
arch/arm/mach-omap2/timer.c
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 40f4a03d728f..bf70e2b57ff8 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h | |||
| @@ -82,8 +82,7 @@ extern void omap2_init_common_infrastructure(void); | |||
| 82 | extern void omap2_sync32k_timer_init(void); | 82 | extern void omap2_sync32k_timer_init(void); |
| 83 | extern void omap3_sync32k_timer_init(void); | 83 | extern void omap3_sync32k_timer_init(void); |
| 84 | extern void omap3_secure_sync32k_timer_init(void); | 84 | extern void omap3_secure_sync32k_timer_init(void); |
| 85 | extern void omap3_gp_gptimer_timer_init(void); | 85 | extern void omap3_gptimer_timer_init(void); |
| 86 | extern void omap3_am33xx_gptimer_timer_init(void); | ||
| 87 | extern void omap4_local_timer_init(void); | 86 | extern void omap4_local_timer_init(void); |
| 88 | extern void omap5_realtime_timer_init(void); | 87 | extern void omap5_realtime_timer_init(void); |
| 89 | 88 | ||