diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2019-05-06 16:39:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2019-05-06 16:39:31 -0700 |
| commit | ccbc2e5ed192ccd2663477107379f843d072e649 (patch) | |
| tree | 13a180031283a7cc2275902cf45e1bc1d9cd5ee6 /arch/m68k/sun3x/time.h | |
| parent | Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | Documentation/features/time: Mark m68k having modern-timekeeping (diff) | |
| download | linux-ccbc2e5ed192ccd2663477107379f843d072e649.tar.gz linux-ccbc2e5ed192ccd2663477107379f843d072e649.tar.bz2 linux-ccbc2e5ed192ccd2663477107379f843d072e649.zip | |
Merge tag 'm68k-for-v5.2-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- drop arch_gettimeoffset and adopt clocksource API
- defconfig updates
* tag 'm68k-for-v5.2-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
Documentation/features/time: Mark m68k having modern-timekeeping
m68k: defconfig: Update defconfigs for v5.1-rc1
m68k: mvme16x: Handle timer counter overflow
m68k: mvme16x: Convert to clocksource API
m68k: mvme147: Handle timer counter overflow
m68k: mvme147: Convert to clocksource API
m68k: mac: Convert to clocksource API
m68k: hp300: Handle timer counter overflow
m68k: hp300: Convert to clocksource API
m68k: bvme6000: Convert to clocksource API
m68k: atari: Convert to clocksource API
m68k: amiga: Convert to clocksource API
m68k: Drop ARCH_USES_GETTIMEOFFSET
m68k: apollo, q40, sun3, sun3x: Remove arch_gettimeoffset implementations
m68k: mac: Fix VIA timer counter accesses
m68k: Call timer_interrupt() with interrupts disabled
Diffstat (limited to 'arch/m68k/sun3x/time.h')
| -rw-r--r-- | arch/m68k/sun3x/time.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/sun3x/time.h b/arch/m68k/sun3x/time.h index 496f406412ad..86ce78bb3c28 100644 --- a/arch/m68k/sun3x/time.h +++ b/arch/m68k/sun3x/time.h @@ -3,7 +3,6 @@ #define SUN3X_TIME_H extern int sun3x_hwclk(int set, struct rtc_time *t); -u32 sun3x_gettimeoffset(void); void sun3x_sched_init(irq_handler_t vector); struct mostek_dt { |