Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7730bef9c5eaaecc3f441cd389ae189b17759117
Commit: 7730bef9c5eaaecc3f441cd389ae189b17759117
Parent: 84f1b6783a8f7057f3d7a5388c5f3f4a8bce7b0b
Author: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
AuthorDate: Sat Jan 20 13:59:35 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Wed Feb 21 13:34:46 2007 -0200
V4L/DVB (5108): Remove_cx88_ioctl
cx88_ioctl were merged at the master ioctl handler on cx88-blackbird
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
drivers/media/video/cx88/cx88-blackbird.c | 27 ---------------------------
1 files changed, 0 insertions(+), 27 deletions(-)
diff --git a/drivers/media/video/cx88/cx88-blackbird.c
b/drivers/media/video/cx88/cx88-blackbird.c
index e194949..187e917 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -119,9 +119,6 @@ static struct cx88_tvnorm tvnorms[] = {
.cxoformat = 0x181f0008,
}
};
-int cx88_do_ioctl( struct inode *inode, struct file *file,
- int radio, struct cx88_core *core, unsigned int cmd,
- void *arg, v4l2_kioctl driver_ioctl );
#define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024
@@ -1000,30 +997,6 @@ static int mpeg_do_ioctl(struct inode *inode, struct file
*file,
return cx8800_ctrl_query(qctrl);
}
- default:
- return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg,
cx88_ioctl_hook);
- }
- return 0;
-}
-
-int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
- struct cx88_core *core, unsigned int cmd, void *arg,
v4l2_kioctl driver_ioctl)
-{
- int err;
-
- if (debug) {
- if (debug > 1) {
- if (_IOC_DIR(cmd) & _IOC_WRITE)
- v4l_printk_ioctl_arg("cx88(w)",cmd, arg);
- else if (!_IOC_DIR(cmd) & _IOC_READ) {
- v4l_print_ioctl("cx88", cmd);
- }
- } else
- v4l_print_ioctl(core->name,cmd);
-
- }
-
- switch (cmd) {
/* ------ input switching ---------- */
case VIDIOC_ENUMINPUT:
{
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
