diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-18 08:22:06 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-18 08:22:06 -0300 |
commit | 96cbbc792854ad33325f55e2b095d27d195537e7 (patch) | |
tree | 0a1a2b20fbc58ae19955e65e30193faf330fc26d /linux/sound/pci/bt87x.c | |
parent | 043941b563e911ccb213664f4471e985da89147a (diff) | |
parent | f2ead120937d5077a260732019a12e6ed6c6752e (diff) | |
download | mediapointer-dvb-s2-96cbbc792854ad33325f55e2b095d27d195537e7.tar.gz mediapointer-dvb-s2-96cbbc792854ad33325f55e2b095d27d195537e7.tar.bz2 |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound/pci/bt87x.c')
-rw-r--r-- | linux/sound/pci/bt87x.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index cbbd22b4a..a6e7971e3 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -35,23 +35,6 @@ #include <sound/control.h> #include <sound/initval.h> #include "compat.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) -/* structs that used to be typedefs */ -#define snd_card _snd_card -#define snd_pcm _snd_pcm -#define snd_pcm_substream _snd_pcm_substream -#define snd_pcm_hardware _snd_pcm_hardware -#define snd_pcm_runtime _snd_pcm_runtime -#define snd_pcm_hw_params sndrv_pcm_hw_params -#define snd_pcm_ops _snd_pcm_ops -#define snd_ctl_elem_info sndrv_ctl_elem_info -#define snd_ctl_elem_value sndrv_ctl_elem_value -#undef snd_kcontrol -#define snd_kcontrol _snd_kcontrol -#define snd_kcontrol_new _snd_kcontrol_new -#undef snd_device -#define snd_device _snd_device -#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) /* From linux/pch_ids.h, appeared in 2.6.14 */ #define PCI_DEVICE_ID_BROOKTREE_879 0x0879 |