From: Ian Kent <raven@themaw.net>
Date: Tue, 15 Mar 2016 21:58:47 +0000 (-0700)
Subject: autofs4: fix string.h include in auto_dev-ioctl.h
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;ds=sidebyside;h=63c06227a22b098a3849c5c99e836aea161ca0d7;p=deliverable%2Flinux.git

autofs4: fix string.h include in auto_dev-ioctl.h

Since including linux/string.h will now do the right thing remove the
conditional check.

Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/auto_dev-ioctl.h b/include/linux/auto_dev-ioctl.h
index 642781612062..7caaf298f539 100644
--- a/include/linux/auto_dev-ioctl.h
+++ b/include/linux/auto_dev-ioctl.h
@@ -11,12 +11,7 @@
 #define _LINUX_AUTO_DEV_IOCTL_H
 
 #include <linux/auto_fs.h>
-
-#ifdef __KERNEL__
 #include <linux/string.h>
-#else
-#include <string.h>
-#endif /* __KERNEL__ */
 
 #define AUTOFS_DEVICE_NAME		"autofs"