diff options
| author | Ian Kent <raven@themaw.net> | 2018-06-07 20:11:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 20:34:39 -0400 |
| commit | ef8b42f78e883cb72fd781c2eff3a42d89c1c0c3 (patch) | |
| tree | 4fbdaa1a4b512809e1fa1c1d032217bdf7bb9bd8 /fs/compat_ioctl.c | |
| parent | 5cc41e099504b77014358b58567c5ea6293dd220 (diff) | |
autofs4: merge auto_fs.h and auto_fs4.h
The autofs module has long since been removed so there's no need to have
two separate include files for autofs.
Link: http://lkml.kernel.org/r/152626703024.28589.9571964661718767929.stgit@pluto.themaw.net
Signed-off-by: Ian Kent <raven@themaw.net>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index ef80085ed564..b3e1768b636e 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/if_pppox.h> | 39 | #include <linux/if_pppox.h> |
| 40 | #include <linux/mtio.h> | 40 | #include <linux/mtio.h> |
| 41 | #include <linux/auto_fs.h> | 41 | #include <linux/auto_fs.h> |
| 42 | #include <linux/auto_fs4.h> | ||
| 43 | #include <linux/tty.h> | 42 | #include <linux/tty.h> |
| 44 | #include <linux/vt_kern.h> | 43 | #include <linux/vt_kern.h> |
| 45 | #include <linux/fb.h> | 44 | #include <linux/fb.h> |