Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / drivers / media / video / saa5249.c

diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 6f14619bda4a5b87f04890605fbd0fa39187c97b..0d639738d4e68044f4fa651b97d35573b820da83 100644 (file)
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -712,7 +712,6 @@ static const struct file_operations saa_fops = {
 static struct video_device saa_template =
 {
        .name           = IF_NAME,
-       .type           = VID_TYPE_TELETEXT,    /*| VID_TYPE_TUNER ?? */
        .fops           = &saa_fops,
 };