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 branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
[sfrench/cifs-2.6.git]
/
arch
/
m68k
/
mac
/
misc.c
diff --git
a/arch/m68k/mac/misc.c
b/arch/m68k/mac/misc.c
index c6d351f5bd79aacd8faa7a091fb3b24325547635..3b1f7a6159f8ce414fc57ef72985eac8804280c7 100644
(file)
--- a/
arch/m68k/mac/misc.c
+++ b/
arch/m68k/mac/misc.c
@@
-4,7
+4,6
@@
#include <linux/types.h>
#include <linux/errno.h>
-#include <linux/miscdevice.h>
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/sched.h>