Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-pull

[linux-2.6] / drivers / media / radio / radio-sf16fmi.c

diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 75b68a0245410d4019fb93e5a71302aeb4c14d10..bb5d92f104af000177afab5c202652adafc7a0f8 100644 (file)
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -311,9 +311,7 @@ static const struct v4l2_ioctl_ops fmi_ioctl_ops = {
 };
 
 static struct video_device fmi_radio = {
-       .owner          = THIS_MODULE,
        .name           = "SF16FMx radio",
-       .type           = VID_TYPE_TUNER,
        .fops           = &fmi_fops,
        .ioctl_ops      = &fmi_ioctl_ops,
 };