[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20070428192005.GT3468@stusta.de>
Date: Sat, 28 Apr 2007 21:20:05 +0200
From: Adrian Bunk <bunk@...sta.de>
To: michael@...u.de, mchehab@...radead.org
Cc: v4l-dvb-maintainer@...uxtv.org, linux-kernel@...r.kernel.org
Subject: [2.6 patch] proper prototype for saa7146_video_do_ioctl()
This patch adds a proper prototype for saa7146_video_do_ioctl() in
include/media/saa7146_vv.h
Signed-off-by: Adrian Bunk <bunk@...sta.de>
---
drivers/media/common/saa7146_fops.c | 1 -
include/media/saa7146_vv.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
--- linux-2.6.21-rc7-mm2/include/media/saa7146_vv.h.old 2007-04-28 15:04:39.000000000 +0200
+++ linux-2.6.21-rc7-mm2/include/media/saa7146_vv.h 2007-04-28 15:05:11.000000000 +0200
@@ -216,6 +216,8 @@
extern struct saa7146_use_ops saa7146_video_uops;
int saa7146_start_preview(struct saa7146_fh *fh);
int saa7146_stop_preview(struct saa7146_fh *fh);
+int saa7146_video_do_ioctl(struct inode *inode, struct file *file,
+ unsigned int cmd, void *arg);
/* from saa7146_vbi.c */
extern struct saa7146_use_ops saa7146_vbi_uops;
--- linux-2.6.21-rc7-mm2/drivers/media/common/saa7146_fops.c.old 2007-04-28 15:05:32.000000000 +0200
+++ linux-2.6.21-rc7-mm2/drivers/media/common/saa7146_fops.c 2007-04-28 15:05:44.000000000 +0200
@@ -307,7 +307,6 @@
return 0;
}
-int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg);
static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
{
/*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists