Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / drivers / media / video / bw-qcam.c

diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index ec870c781c021ef5b702e5c5dcf36bac2583fe5e..d3b3268bace8795dcde4e8d6f1e002d61fa24b7f 100644 (file)
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -908,7 +908,6 @@ static const struct file_operations qcam_fops = {
 static struct video_device qcam_template=
 {
        .name           = "Connectix Quickcam",
-       .type           = VID_TYPE_CAPTURE,
        .fops           = &qcam_fops,
 };