The patch number 10913 was added via Hans Verkuil <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        Linux Media Mailing List <[email protected]>

------

From: Hans Verkuil  <[email protected]>
tea575x-tuner: compile fixes for older kernels.


Priority: normal

Signed-off-by: Hans Verkuil <[email protected]>


---

 linux/sound/i2c/other/tea575x-tuner.c |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff -r b71b42e8205c -r 2a66a937f7ed linux/sound/i2c/other/tea575x-tuner.c
--- a/linux/sound/i2c/other/tea575x-tuner.c     Fri Mar 06 13:58:12 2009 +0100
+++ b/linux/sound/i2c/other/tea575x-tuner.c     Fri Mar 06 14:05:50 2009 +0100
@@ -77,11 +77,7 @@ static struct v4l2_queryctrl radio_qctrl
  * lowlevel part
  */
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
-static void snd_tea575x_set_freq(tea575x_t *tea)
-#else
 static void snd_tea575x_set_freq(struct snd_tea575x *tea)
-#endif
 {
        unsigned long freq;
 
@@ -209,9 +205,9 @@ static int vidioc_g_ctrl(struct file *fi
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                        struct v4l2_control *ctrl)
 {
-       struct snd_tea575x *tea = video_drvdata(file);
-
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)
+       struct snd_tea575x *tea = video_drvdata(file);
+
        switch (ctrl->id) {
        case V4L2_CID_AUDIO_MUTE:
                if (tea->ops->mute) {
@@ -226,9 +222,9 @@ static int vidioc_s_ctrl(struct file *fi
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                        struct v4l2_control *ctrl)
 {
-       struct snd_tea575x *tea = video_drvdata(file);
-
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)
+       struct snd_tea575x *tea = video_drvdata(file);
+
        switch (ctrl->id) {
        case V4L2_CID_AUDIO_MUTE:
                if (tea->ops->mute) {
@@ -301,11 +297,7 @@ static struct video_device tea575x_radio
 /*
  * initialize all the tea575x chips
  */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
-void snd_tea575x_init(tea575x_t *tea)
-#else
 void snd_tea575x_init(struct snd_tea575x *tea)
-#endif
 {
        int retval;
        unsigned int val;


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/2a66a937f7ed4b9dd35993a0214d9287595ea28b

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to