summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Stezenbach <js@sig21.net>2011-07-07 08:18:18 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-07-07 08:18:18 +0200
commit719c0c590609809365c6f3da2f923cd84dc99113 (patch)
tree24b89ce02697d723ce65be12d557313c3a398988
parent0f79960391a5a1e3679956024e18aeeb0369ac44 (diff)
compat_ioctl: fix make headers_check regression
Fix headers_check error introduced by 390192b30057: include/linux/fd.h:6: included file 'linux/compat.h' is not exported Signed-off-by: Johannes Stezenbach <js@sig21.net> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--include/linux/fd.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/fd.h b/include/linux/fd.h
index c6a68d01160..72202b1b9a6 100644
--- a/include/linux/fd.h
+++ b/include/linux/fd.h
@@ -3,7 +3,6 @@
#include <linux/ioctl.h>
#include <linux/compiler.h>
-#include <linux/compat.h>
/* New file layout: Now the ioctl definitions immediately follow the
* definitions of the structures that they use */
@@ -378,7 +377,11 @@ struct floppy_raw_cmd {
#define FDEJECT _IO(2, 0x5a)
/* eject the disk */
+
+#ifdef __KERNEL__
#ifdef CONFIG_COMPAT
+#include <linux/compat.h>
+
struct compat_floppy_struct {
compat_uint_t size;
compat_uint_t sect;
@@ -394,5 +397,6 @@ struct compat_floppy_struct {
#define FDGETPRM32 _IOR(2, 0x04, struct compat_floppy_struct)
#endif
+#endif
#endif