summaryrefslogtreecommitdiff
path: root/arch/m68k/sun3x/time.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/sun3x/time.c
parent9931faca02c604c22335f5a935a501bb2ace6e20 (diff)
parent90cf214d6a549bf482e3c5751ee256cc885b96ea (diff)
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
Diffstat (limited to 'arch/m68k/sun3x/time.c')
-rw-r--r--arch/m68k/sun3x/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c
index 1d0a72480409..c8eb08add6b0 100644
--- a/arch/m68k/sun3x/time.c
+++ b/arch/m68k/sun3x/time.c
@@ -71,7 +71,7 @@ int sun3x_hwclk(int set, struct rtc_time *t)
return 0;
}
/* Not much we can do here */
-unsigned long sun3x_gettimeoffset (void)
+u32 sun3x_gettimeoffset(void)
{
return 0L;
}