diff options
| author | Michael Krufky <mkrufky@kernellabs.com> | 2009-09-15 11:14:17 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@kernellabs.com> | 2009-09-15 11:14:17 -0400 |
| commit | b0d1e983e98ec9b72146c16d08b3409a418c62df (patch) | |
| tree | b61e50f54f11599f31b476c477a69883597f5fad /linux/sound/i2c | |
| parent | 2c16279409d239adbbc884a308e71264ea02ef46 (diff) | |
| parent | 219fe38bd79dab42db83cacc1f5444d0e27fa8ea (diff) | |
| download | mediapointer-dvb-s2-b0d1e983e98ec9b72146c16d08b3409a418c62df.tar.gz mediapointer-dvb-s2-b0d1e983e98ec9b72146c16d08b3409a418c62df.tar.bz2 | |
merge: ~mkrufky/tda18271
From: Michael Krufky <mkrufky@kernellabs.com>
Priority: normal
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Diffstat (limited to 'linux/sound/i2c')
| -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; |