From 287e2434ca3c21bd38d24439a266c6d3d5a73528 Mon Sep 17 00:00:00 2001
From: Johannes Stezenbach <js@sig21.net>
Date: Thu, 7 Jul 2011 08:18:18 +0200
Subject: [PATCH] --- yaml --- r: 258606 b: refs/heads/master c:
 719c0c590609809365c6f3da2f923cd84dc99113 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/linux/fd.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9dddc2ff0970..b4e23a1d02b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f79960391a5a1e3679956024e18aeeb0369ac44
+refs/heads/master: 719c0c590609809365c6f3da2f923cd84dc99113
diff --git a/trunk/include/linux/fd.h b/trunk/include/linux/fd.h
index c6a68d011608..72202b1b9a6a 100644
--- a/trunk/include/linux/fd.h
+++ b/trunk/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