diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-30 18:56:14 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-30 18:56:14 -0300 |
| commit | 502293205239f8ec860b4c33187cd7a3fc0f421c (patch) | |
| tree | 3859aab46057cb3726731ca0ef65cd45c9e73660 /linux/sound/i2c/other/tea575x-tuner.c | |
| parent | 71911bc952f2394dede17c5713de0b0dfcb04fae (diff) | |
| parent | 52ef68ff244a5cd4707558c9aa803ecb9c1342dc (diff) | |
| download | mediapointer-dvb-s2-502293205239f8ec860b4c33187cd7a3fc0f421c.tar.gz mediapointer-dvb-s2-502293205239f8ec860b4c33187cd7a3fc0f421c.tar.bz2 | |
merge: http://kernellabs.com/hg/~mkrufky/tda18271
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/sound/i2c/other/tea575x-tuner.c')
| -rw-r--r-- | linux/sound/i2c/other/tea575x-tuner.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/linux/sound/i2c/other/tea575x-tuner.c b/linux/sound/i2c/other/tea575x-tuner.c index 8937198db..c5add7cb0 100644 --- a/linux/sound/i2c/other/tea575x-tuner.c +++ b/linux/sound/i2c/other/tea575x-tuner.c @@ -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_queryctrl(struct file *file, void *priv, static int vidioc_g_ctrl(struct file *file, void *priv, struct v4l2_control *ctrl) { +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17) struct snd_tea575x *tea = video_drvdata(file); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17) switch (ctrl->id) { case V4L2_CID_AUDIO_MUTE: if (tea->ops->mute) { @@ -226,9 +222,9 @@ static int vidioc_g_ctrl(struct file *file, void *priv, static int vidioc_s_ctrl(struct file *file, void *priv, struct v4l2_control *ctrl) { +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17) struct snd_tea575x *tea = video_drvdata(file); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17) 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; |