summaryrefslogtreecommitdiff
path: root/arch/arm/mach-netx/generic.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 /arch/arm/mach-netx/generic.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 'arch/arm/mach-netx/generic.h')
-rw-r--r--arch/arm/mach-netx/generic.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-netx/generic.h b/arch/arm/mach-netx/generic.h
index 9b915119b8d6..768b26bbb42b 100644
--- a/arch/arm/mach-netx/generic.h
+++ b/arch/arm/mach-netx/generic.h
@@ -21,5 +21,4 @@ extern void __init netx_map_io(void);
extern void __init netx_init_irq(void);
extern void netx_restart(char, const char *);
-struct sys_timer;
-extern struct sys_timer netx_timer;
+extern void netx_timer_init(void);