Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

compat_ioctl: fix make headers_check regression

Browse source 
Fix headers_check error introduced by 390192b300:

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>
This commit is contained in:
Johannes Stezenbach 2011-07-07 08:18:18 +02:00 committed by Jens Axboe
parent 0f79960391
commit 719c0c5906
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/linux/fd.h
View file

@ -3,7 +3,6 @@
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/compat.h>
/* New file layout: Now the ioctl definitions immediately follow the /* New file layout: Now the ioctl definitions immediately follow the
* definitions of the structures that they use */ * definitions of the structures that they use */
@ -378,7 +377,11 @@ struct floppy_raw_cmd {
#define FDEJECT _IO(2, 0x5a) #define FDEJECT _IO(2, 0x5a)
/* eject the disk */ /* eject the disk */
#ifdef __KERNEL__
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
#include <linux/compat.h>
struct compat_floppy_struct { struct compat_floppy_struct {
compat_uint_t size; compat_uint_t size;
compat_uint_t sect; compat_uint_t sect;
@ -394,5 +397,6 @@ struct compat_floppy_struct {
#define FDGETPRM32 _IOR(2, 0x04, struct compat_floppy_struct) #define FDGETPRM32 _IOR(2, 0x04, struct compat_floppy_struct)
#endif #endif
#endif
#endif #endif