diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 19:56:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 19:56:42 -0400 |
| commit | fb6363e9f4eeb37323feb8253b93854195942b8b (patch) | |
| tree | 556f873d92cd7af2e92d176afc16339d902b7c2c | |
| parent | ce6a01c2d50e1d400cb6d492841f9b1932034fc2 (diff) | |
| parent | 9a6462763b170bd22be707d5d9e2b8ba8cc4028e (diff) | |
Merge tag 'm68k-for-v4.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
"Preparatory work for Arnd's genrtc removal series"
* tag 'm68k-for-v4.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/mvme16x: Include generic <linux/rtc.h>
m68k/bvme6000: Include generic <linux/rtc.h>
| -rw-r--r-- | arch/m68k/bvme6000/rtc.c | 2 | ||||
| -rw-r--r-- | arch/m68k/mvme16x/rtc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c index cf12a17dc289..f7984f44ff0f 100644 --- a/arch/m68k/bvme6000/rtc.c +++ b/arch/m68k/bvme6000/rtc.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/poll.h> | 16 | #include <linux/poll.h> |
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/mc146818rtc.h> /* For struct rtc_time and ioctls, etc */ | 18 | #include <linux/rtc.h> /* For struct rtc_time and ioctls, etc */ |
| 19 | #include <linux/bcd.h> | 19 | #include <linux/bcd.h> |
| 20 | #include <asm/bvme6000hw.h> | 20 | #include <asm/bvme6000hw.h> |
| 21 | 21 | ||
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c index 1755e2f7137d..1cdc73268188 100644 --- a/arch/m68k/mvme16x/rtc.c +++ b/arch/m68k/mvme16x/rtc.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/fcntl.h> | 14 | #include <linux/fcntl.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/poll.h> | 16 | #include <linux/poll.h> |
| 17 | #include <linux/mc146818rtc.h> /* For struct rtc_time and ioctls, etc */ | 17 | #include <linux/rtc.h> /* For struct rtc_time and ioctls, etc */ |
| 18 | #include <linux/bcd.h> | 18 | #include <linux/bcd.h> |
| 19 | #include <asm/mvme16xhw.h> | 19 | #include <asm/mvme16xhw.h> |
| 20 | 20 | ||