diff options
| author | Anton Altaparmakov <aia21@cam.ac.uk> | 2002-04-06 17:06:56 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@drop.stormcorp.org> | 2002-04-06 17:06:56 +0100 |
| commit | 95015ed064d9e6c4e8594e2a85f7f3ff6236b0a1 (patch) | |
| tree | a3ab75166d13d3bcc017c23f3a49d60526e199bb /include/linux/videodev.h | |
| parent | fbc5dabd779e42ab0c01542871f365bec395d80f (diff) | |
| parent | cbba4f5ef5c3298451d51aca1b74ad0040ff9c5a (diff) | |
Merge cam.ac.uk:/rain/usr/src/bklinux-2.5 into cam.ac.uk:/usr/src/tng
Diffstat (limited to 'include/linux/videodev.h')
| -rw-r--r-- | include/linux/videodev.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/videodev.h b/include/linux/videodev.h index 542e3ececef4..80966ed8e288 100644 --- a/include/linux/videodev.h +++ b/include/linux/videodev.h @@ -37,8 +37,6 @@ struct video_device * video_generic_ioctl() does the userspace copying of the * ioctl arguments */ struct file_operations *fops; - int (*kernel_ioctl)(struct inode *inode, struct file *file, - unsigned int cmd, void *arg); void *priv; /* Used to be 'private' but that upsets C++ */ /* for videodev.c intenal usage -- don't touch */ @@ -60,8 +58,10 @@ extern struct video_device* video_devdata(struct file*); extern int video_exclusive_open(struct inode *inode, struct file *file); extern int video_exclusive_release(struct inode *inode, struct file *file); -extern int video_generic_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg); +extern int video_usercopy(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg, + int (*func)(struct inode *inode, struct file *file, + unsigned int cmd, void *arg)); #endif /* __KERNEL__ */ #define VID_TYPE_CAPTURE 1 /* Can capture */ |