media: media/pci: rename VFL_TYPE_GRABBER to _VIDEO

[linux-2.6-microblaze.git] / drivers / media / pci / cx18 / cx18-streams.c

diff --git a/drivers/media/pci/cx18/cx18-streams.c b/drivers/media/pci/cx18/cx18-streams.c
index b797185..3178df3 100644 (file)
--- a/drivers/media/pci/cx18/cx18-streams.c
+++ b/drivers/media/pci/cx18/cx18-streams.c
@@ -48,19 +48,19 @@ static struct {
 } cx18_stream_info[] = {
        {       /* CX18_ENC_STREAM_TYPE_MPG */
                "encoder MPEG",
-               VFL_TYPE_GRABBER, 0,
+               VFL_TYPE_VIDEO, 0,
                PCI_DMA_FROMDEVICE,
                V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
                V4L2_CAP_AUDIO | V4L2_CAP_TUNER
        },
        {       /* CX18_ENC_STREAM_TYPE_TS */
                "TS",
-               VFL_TYPE_GRABBER, -1,
+               VFL_TYPE_VIDEO, -1,
                PCI_DMA_FROMDEVICE,
        },
        {       /* CX18_ENC_STREAM_TYPE_YUV */
                "encoder YUV",
-               VFL_TYPE_GRABBER, CX18_V4L2_ENC_YUV_OFFSET,
+               VFL_TYPE_VIDEO, CX18_V4L2_ENC_YUV_OFFSET,
                PCI_DMA_FROMDEVICE,
                V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
                V4L2_CAP_STREAMING | V4L2_CAP_AUDIO | V4L2_CAP_TUNER
@@ -74,13 +74,13 @@ static struct {
        },
        {       /* CX18_ENC_STREAM_TYPE_PCM */
                "encoder PCM audio",
-               VFL_TYPE_GRABBER, CX18_V4L2_ENC_PCM_OFFSET,
+               VFL_TYPE_VIDEO, CX18_V4L2_ENC_PCM_OFFSET,
                PCI_DMA_FROMDEVICE,
                V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
        },
        {       /* CX18_ENC_STREAM_TYPE_IDX */
                "encoder IDX",
-               VFL_TYPE_GRABBER, -1,
+               VFL_TYPE_VIDEO, -1,
                PCI_DMA_FROMDEVICE,
        },
        {       /* CX18_ENC_STREAM_TYPE_RAD */
@@ -434,7 +434,7 @@ static int cx18_reg_dev(struct cx18 *cx, int type)
        name = video_device_node_name(&s->video_dev);
 
        switch (vfl_type) {
-       case VFL_TYPE_GRABBER:
+       case VFL_TYPE_VIDEO:
                CX18_INFO("Registered device %s for %s (%d x %d.%02d kB)\n",
                          name, s->name, cx->stream_buffers[type],
                          cx->stream_buf_size[type] / 1024,