Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb6363e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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>
parents ce6a01c2 9a646276

arch/m68k/bvme6000/rtc.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/init.h>

#include <linux/poll.h>

#include <linux/module.h>

#include <linux/mc146818rtc.h>	/* For struct rtc_time and ioctls, etc */

#include <linux/rtc.h>	/* For struct rtc_time and ioctls, etc */

#include <linux/bcd.h>

#include <asm/bvme6000hw.h>

arch/m68k/mvme16x/rtc.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/fcntl.h>

#include <linux/init.h>

#include <linux/poll.h>

#include <linux/mc146818rtc.h>	/* For struct rtc_time and ioctls, etc */

#include <linux/rtc.h>	/* For struct rtc_time and ioctls, etc */

#include <linux/bcd.h>

#include <asm/mvme16xhw.h>