summaryrefslogtreecommitdiff
path: root/include/linux/sunxi_timer.h
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2013-01-14 21:44:27 -0700
committerStephen Warren <swarren@wwwdotorg.org>2013-01-14 21:44:27 -0700
commitb2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6 (patch)
treeed79658afd978b1e52ace0fb58d1628b79c0f78b /include/linux/sunxi_timer.h
parent9931faca02c604c22335f5a935a501bb2ace6e20 (diff)
parent90cf214d6a549bf482e3c5751ee256cc885b96ea (diff)
downloadlinux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.tar.gz
linux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.tar.xz
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
Diffstat (limited to 'include/linux/sunxi_timer.h')
-rw-r--r--include/linux/sunxi_timer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sunxi_timer.h b/include/linux/sunxi_timer.h
index b9165bba6e61..18081787e5f3 100644
--- a/include/linux/sunxi_timer.h
+++ b/include/linux/sunxi_timer.h
@@ -19,6 +19,6 @@
#include <asm/mach/time.h>
-extern struct sys_timer sunxi_timer;
+void sunxi_timer_init(void);
#endif