From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Mon, 3 Jun 2013 08:36:48 +0000 (-0300)
Subject: [media] saa7134: drop deprecated current_norm
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=776572d95f0a80a3ae732569fd2ee6eadc9c8486;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

[media] saa7134: drop deprecated current_norm

Since this driver properly implements g_std, the current_norm field is
actually unused anyway.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c
index 05ab2cb7ef3c..973fa65eb3d3 100644
--- a/drivers/media/pci/saa7134/saa7134-empress.c
+++ b/drivers/media/pci/saa7134/saa7134-empress.c
@@ -471,7 +471,6 @@ static struct video_device saa7134_empress_template = {
 	.ioctl_ops     = &ts_ioctl_ops,
 
 	.tvnorms			= SAA7134_NORMS,
-	.current_norm			= V4L2_STD_PAL,
 };
 
 static void empress_signal_update(struct work_struct *work)
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index db4cc1c54aa6..b78d515068a7 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -2439,7 +2439,6 @@ struct video_device saa7134_video_template = {
 	.fops				= &video_fops,
 	.ioctl_ops 			= &video_ioctl_ops,
 	.tvnorms			= SAA7134_NORMS,
-	.current_norm			= V4L2_STD_PAL,
 };
 
 struct video_device saa7134_radio_template = {