diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/comedi/comedi_compat32.h | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/comedi/comedi_compat32.h')
-rw-r--r-- | drivers/staging/comedi/comedi_compat32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/comedi_compat32.h b/drivers/staging/comedi/comedi_compat32.h index 0ca0164..fd0f8a3 100644 --- a/drivers/staging/comedi/comedi_compat32.h +++ b/drivers/staging/comedi/comedi_compat32.h @@ -28,14 +28,14 @@ #define _COMEDI_COMPAT32_H #include <linux/compat.h> -#include <linux/fs.h> /* For HAVE_COMPAT_IOCTL and HAVE_UNLOCKED_IOCTL */ +#include <linux/fs.h> /* For HAVE_COMPAT_IOCTL and HAVE_UNLOCKED_IOCTL */ #ifdef CONFIG_COMPAT #ifdef HAVE_COMPAT_IOCTL extern long comedi_compat_ioctl(struct file *file, unsigned int cmd, - unsigned long arg); + unsigned long arg); #define comedi_register_ioctl32() do {} while (0) #define comedi_unregister_ioctl32() do {} while (0) |