diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2011-02-03 13:42:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-04 12:44:31 -0800 |
| commit | f2b3c685b9b1c048cfa8bef98dac037275b9d20d (patch) | |
| tree | 16f587830a4dc3efc3bbcedd9e980ffb1cb3401f /drivers/staging/easycap/easycap.h | |
| parent | 9306b1bb8b6de05786c8aa79a19988aa15453968 (diff) | |
staging/easycap: kill EASYCAP_NEEDS_UNLOCKED_IOCTL
we can kill this option for in-kernel driver
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap/easycap.h')
| -rw-r--r-- | drivers/staging/easycap/easycap.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h index 589f0387e75f..47467d5fdd2c 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/easycap/easycap.h @@ -33,7 +33,6 @@ * EASYCAP_NEEDS_USBVIDEO_H * EASYCAP_NEEDS_V4L2_DEVICE_H * EASYCAP_NEEDS_V4L2_FOPS - * EASYCAP_NEEDS_UNLOCKED_IOCTL * EASYCAP_SILENT * * IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER @@ -511,9 +510,7 @@ __s16 oldaudio; * VIDEO FUNCTION PROTOTYPES */ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ -long easycap_ioctl_noinode(struct file *, unsigned int, unsigned long); -int easycap_ioctl(struct inode *, struct file *, unsigned int, unsigned long); - +long easycap_unlocked_ioctl(struct file *, unsigned int, unsigned long); int easycap_dqbuf(struct easycap *, int); int submit_video_urbs(struct easycap *); int kill_video_urbs(struct easycap *); |