Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / media / dvb / ttpci / av7110_v4l.c

diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index 76cca003252fdf6c69e5274651a0428aae4100fd..b4a0cc5dc935ffec2c9310385c7816d1e24f40a4 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -573,7 +573,7 @@ static int av7110_vbi_reset(struct inode *inode, struct file *file)
        struct saa7146_dev *dev = fh->dev;
        struct av7110 *av7110 = (struct av7110*) dev->ext_priv;
 
-       dprintk(2, "%s\n", __FUNCTION__);
+       dprintk(2, "%s\n", __func__);
        av7110->wssMode = 0;
        av7110->wssData = 0;
        if (FW_VERSION(av7110->arm_app) < 0x2623)
@@ -590,7 +590,7 @@ static ssize_t av7110_vbi_write(struct file *file, const char __user *data, size
        struct v4l2_sliced_vbi_data d;
        int rc;
 
-       dprintk(2, "%s\n", __FUNCTION__);
+       dprintk(2, "%s\n", __func__);
        if (FW_VERSION(av7110->arm_app) < 0x2623 || !av7110->wssMode || count != sizeof d)
                return -EINVAL;
        if (copy_from_user(&d, data, count))
@@ -876,11 +876,11 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
        struct av7110 *av7110 = (struct av7110*) dev->ext_priv;
 
        if (std->id & V4L2_STD_PAL) {
-               av7110->vidmode = VIDEO_MODE_PAL;
+               av7110->vidmode = AV7110_VIDEO_MODE_PAL;
                av7110_set_vidmode(av7110, av7110->vidmode);
        }
        else if (std->id & V4L2_STD_NTSC) {
-               av7110->vidmode = VIDEO_MODE_NTSC;
+               av7110->vidmode = AV7110_VIDEO_MODE_NTSC;
                av7110_set_vidmode(av7110, av7110->vidmode);
        }
        else