diff options
| author | Ian Kent <raven@themaw.net> | 2018-06-07 17:11:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 17:34:39 -0700 |
| commit | ef8b42f78e883cb72fd781c2eff3a42d89c1c0c3 (patch) | |
| tree | 4fbdaa1a4b512809e1fa1c1d032217bdf7bb9bd8 /fs | |
| parent | 5cc41e099504b77014358b58567c5ea6293dd220 (diff) | |
| download | linux-0-day-ef8b42f78e883cb72fd781c2eff3a42d89c1c0c3.tar.gz linux-0-day-ef8b42f78e883cb72fd781c2eff3a42d89c1c0c3.tar.xz | |
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')
| -rw-r--r-- | fs/autofs4/autofs_i.h | 2 | ||||
| -rw-r--r-- | fs/compat_ioctl.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index 4737615f0eaaa..01636f3945d5d 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h @@ -9,7 +9,7 @@ /* Internal header file for autofs */ -#include <linux/auto_fs4.h> +#include <linux/auto_fs.h> #include <linux/auto_dev-ioctl.h> #include <linux/kernel.h> diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index ef80085ed564c..b3e1768b636eb 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -39,7 +39,6 @@ #include <linux/if_pppox.h> #include <linux/mtio.h> #include <linux/auto_fs.h> -#include <linux/auto_fs4.h> #include <linux/tty.h> #include <linux/vt_kern.h> #include <linux/fb.h> |