diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-01-28 10:20:34 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 10:20:34 -0700 |
| commit | f3dab3989b4282e448cba0f0708934276dcb413a (patch) | |
| tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/m68k/include/asm/machdep.h | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
| download | linux-stable-f3dab3989b4282e448cba0f0708934276dcb413a.tar.gz linux-stable-f3dab3989b4282e448cba0f0708934276dcb413a.tar.bz2 linux-stable-f3dab3989b4282e448cba0f0708934276dcb413a.zip | |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup
Diffstat (limited to 'arch/m68k/include/asm/machdep.h')
| -rw-r--r-- | arch/m68k/include/asm/machdep.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h index 825c1c813196..953ca21da8ee 100644 --- a/arch/m68k/include/asm/machdep.h +++ b/arch/m68k/include/asm/machdep.h @@ -3,6 +3,7 @@ #include <linux/seq_file.h> #include <linux/interrupt.h> +#include <linux/time.h> struct pt_regs; struct mktime; @@ -16,7 +17,6 @@ extern void (*mach_init_IRQ) (void); extern void (*mach_get_model) (char *model); extern void (*mach_get_hardware_list) (struct seq_file *m); /* machine dependent timer functions */ -extern unsigned long (*mach_gettimeoffset)(void); extern int (*mach_hwclk)(int, struct rtc_time*); extern unsigned int (*mach_get_ss)(void); extern int (*mach_get_rtc_pll)(struct rtc_pll_info *); |