diff options
| author |   Shawn Bohrer <shawn.bohrer@gmail.com> | 2009-10-18 15:32:16 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 12:23:01 -0800 |
| commit | 5d7ae225540a98b6ee7ab1447c6a1eed89c219cd (patch) | |
| tree | 825a42b67cfa2b3e007b6cf3c5d3473ce4aeacda /drivers/staging/comedi/comedi_compat32.h | |
| parent | staging: comedi: Remove check for HAVE_UNLOCKED_IOCTL (diff) | |
| download | linux-dev-5d7ae225540a98b6ee7ab1447c6a1eed89c219cd.tar.xz linux-dev-5d7ae225540a98b6ee7ab1447c6a1eed89c219cd.zip | |
Staging: comedi: remove check for HAVE_COMPAT_IOCTL
All new kernels have support for compat_ioctl so remove the check and support
for older kernels.
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/comedi_compat32.h')
| -rw-r--r-- | drivers/staging/comedi/comedi_compat32.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/staging/comedi/comedi_compat32.h b/drivers/staging/comedi/comedi_compat32.h index 75d942cd73b5..0340a8949c6b 100644 --- a/drivers/staging/comedi/comedi_compat32.h +++ b/drivers/staging/comedi/comedi_compat32.h @@ -28,32 +28,16 @@ #define _COMEDI_COMPAT32_H #include <linux/compat.h> - -/* For HAVE_COMPAT_IOCTL and HAVE_UNLOCKED_IOCTL */ #include <linux/fs.h> #ifdef CONFIG_COMPAT -#ifdef HAVE_COMPAT_IOCTL - extern long comedi_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg); -#define comedi_register_ioctl32() do {} while (0) -#define comedi_unregister_ioctl32() do {} while (0) - -#else /* HAVE_COMPAT_IOCTL */ - -#define comedi_compat_ioctl 0 /* NULL */ -extern void comedi_register_ioctl32(void); -extern void comedi_unregister_ioctl32(void); - -#endif /* HAVE_COMPAT_IOCTL */ #else /* CONFIG_COMPAT */ #define comedi_compat_ioctl 0 /* NULL */ -#define comedi_register_ioctl32() do {} while (0) -#define comedi_unregister_ioctl32() do {} while (0) #endif /* CONFIG_COMPAT */ |