[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110704100316.GA15894@sig21.net>
Date: Mon, 4 Jul 2011 12:03:17 +0200
From: Johannes Stezenbach <js@...21.net>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Jens Axboe <axboe@...nel.dk>, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, Arnd Bergmann <arnd@...db.de>
Subject: [PATCH] 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@...21.net>
---
I used the same style as in linux/usbdevice_fs.h, hope
that's OK.
include/linux/fd.h | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/include/linux/fd.h b/include/linux/fd.h
index c6a68d0..72202b1 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists