git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.8-rc1' into patchwork
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
sgi-ip22
/
ip22-reset.c
diff --git
a/arch/mips/sgi-ip22/ip22-reset.c
b/arch/mips/sgi-ip22/ip22-reset.c
index 063c2dd31e72856fdf83391ddff0721240df6f1b..2f45b035702148c03db45de8004e63e4a783483e 100644
(file)
--- a/
arch/mips/sgi-ip22/ip22-reset.c
+++ b/
arch/mips/sgi-ip22/ip22-reset.c
@@
-7,7
+7,7
@@
*/
#include <linux/linkage.h>
#include <linux/init.h>
-#include <linux/ds1286.h>
+#include <linux/
rtc/
ds1286.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>