Merge branch 'linus' into x86/x2apic

[linux-2.6-omap-h63xx.git] / drivers / media / radio / miropcm20-radio.c

diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
index 4a332fe8b64b1a2769ee5b37fdee888fee31820d..7fd7ee2d32c11dd2214faf73c1c724be2ddfbabd 100644 (file)
--- a/drivers/media/radio/miropcm20-radio.c
+++ b/drivers/media/radio/miropcm20-radio.c
@@ -229,9 +229,7 @@ static const struct file_operations pcm20_fops = {
 };
 
 static struct video_device pcm20_radio = {
-       .owner          = THIS_MODULE,
        .name           = "Miro PCM 20 radio",
-       .type           = VID_TYPE_TUNER,
        .fops           = &pcm20_fops,
        .priv           = &pcm20_unit
 };