diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 14:47:29 -0400 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 14:47:29 -0400 |
| commit | 2d61aecee8f32259920cdf90a452fa26ffc64e9f (patch) | |
| tree | 2311b6b4c12b946164e8cfb3422cebdfecf08f37 /include/linux/bcm2835_timer.h | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| parent | 6bb27d7349db51b50c40534710fe164ca0d58902 (diff) | |
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
Diffstat (limited to 'include/linux/bcm2835_timer.h')
| -rw-r--r-- | include/linux/bcm2835_timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bcm2835_timer.h b/include/linux/bcm2835_timer.h index 25680fe0903c..ca17aa817006 100644 --- a/include/linux/bcm2835_timer.h +++ b/include/linux/bcm2835_timer.h | |||
| @@ -17,6 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <asm/mach/time.h> | 18 | #include <asm/mach/time.h> |
| 19 | 19 | ||
| 20 | extern struct sys_timer bcm2835_timer; | 20 | extern void bcm2835_timer_init(void); |
| 21 | 21 | ||
| 22 | #endif | 22 | #endif |