projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubi
[firefly-linux-kernel-4.4.55.git]
/
fs
/
compat_ioctl.c
diff --git
a/fs/compat_ioctl.c
b/fs/compat_ioctl.c
index a26bea10e81bae5c9ee1890102ce86b7929bde28..10d8cd90ca6f9dc7870c2a2f8ca460d0d7db2afc 100644
(file)
--- a/
fs/compat_ioctl.c
+++ b/
fs/compat_ioctl.c
@@
-34,7
+34,7
@@
#include <linux/fs.h>
#include <linux/file.h>
#include <linux/ppp_defs.h>
-#include <linux/
if_ppp
.h>
+#include <linux/
ppp-ioctl
.h>
#include <linux/if_pppox.h>
#include <linux/mtio.h>
#include <linux/auto_fs.h>