summaryrefslogtreecommitdiff
path: root/arch/m68k/sun3/intersil.c
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/m68k/sun3/intersil.c
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/m68k/sun3/intersil.c')
-rw-r--r--arch/m68k/sun3/intersil.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c
index 94fe8016f1f0..889829e11f1d 100644
--- a/arch/m68k/sun3/intersil.c
+++ b/arch/m68k/sun3/intersil.c
@@ -23,9 +23,9 @@
#define START_VAL (INTERSIL_RUN | INTERSIL_INT_ENABLE | INTERSIL_24H_MODE)
/* does this need to be implemented? */
-unsigned long sun3_gettimeoffset(void)
+u32 sun3_gettimeoffset(void)
{
- return 1;
+ return 1000;
}