summaryrefslogtreecommitdiff
path: root/linux/sound
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-08 07:25:08 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-08 07:25:08 -0300
commitc13f70467621e2c352f93b336b382e70ea24d218 (patch)
tree582367340fe7529eb3fec3c514ec9d4b2f68ff71 /linux/sound
parenta953cf4edb8db13f8b7d20c793696a13ffcd3333 (diff)
parent9380e197397e3f8404fa2d2effe5c84b6f56735b (diff)
downloadmediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.gz
mediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.bz2
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound')
-rw-r--r--linux/sound/pci/bt87x.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c
index 7e6f22041..f9775c090 100644
--- a/linux/sound/pci/bt87x.c
+++ b/linux/sound/pci/bt87x.c
@@ -37,10 +37,6 @@
#include <sound/control.h>
#include <sound/initval.h>
#include "compat.h"
-#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
-#endif
#ifdef COMPAT_SND_CTL_BOOLEAN_MONO
static int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)