diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-09-11 11:20:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-09-11 11:20:30 -0300 |
| commit | 92d950511773c066da4d622cc6f1f9259ece1c44 (patch) | |
| tree | 3b5eb7a1de90489401726b86c5d0fea385227b68 /linux/drivers/media | |
| parent | f1574b2149f0763188a2c566a05ed973db7141c3 (diff) | |
| parent | a5c1e0911d203b6d468173df00f64db8044e7bce (diff) | |
| download | mediapointer-dvb-s2-92d950511773c066da4d622cc6f1f9259ece1c44.tar.gz mediapointer-dvb-s2-92d950511773c066da4d622cc6f1f9259ece1c44.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/compat
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-alsa.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c index dab6fbc06..f441193eb 100644 --- a/linux/drivers/media/video/cx88/cx88-alsa.c +++ b/linux/drivers/media/video/cx88/cx88-alsa.c @@ -39,7 +39,9 @@ #include <sound/pcm_params.h> #include <sound/control.h> #include <sound/initval.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) #include <sound/tlv.h> +#endif #include "compat.h" #include "cx88.h" @@ -659,17 +661,23 @@ static int snd_cx88_volume_put(struct snd_kcontrol *kcontrol, return changed; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) static const DECLARE_TLV_DB_SCALE(snd_cx88_db_scale, -6300, 100, 0); +#endif static struct snd_kcontrol_new snd_cx88_volume = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, +#endif .name = "Playback Volume", .info = snd_cx88_volume_info, .get = snd_cx88_volume_get, .put = snd_cx88_volume_put, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) .tlv.p = snd_cx88_db_scale, +#endif }; static int snd_cx88_switch_get(struct snd_kcontrol *kcontrol, |