summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/ttpci/budget-ci.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-09-02 06:21:19 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-02 06:21:19 -0300
commitd3cb936980b4090615fdfd74744f7c440aa8be01 (patch)
treea51ec31ef236b3a0831871478b995875b2de0c99 /linux/drivers/media/dvb/ttpci/budget-ci.c
parent659f6de01c8db2a4d84800c14cda9816821a1e11 (diff)
parent9f41018ff536a6dd3b8b7907d6b190c7164297a1 (diff)
downloadmediapointer-dvb-s2-d3cb936980b4090615fdfd74744f7c440aa8be01.tar.gz
mediapointer-dvb-s2-d3cb936980b4090615fdfd74744f7c440aa8be01.tar.bz2
merge: http://linuxtv.org/hg/~tmerle/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/budget-ci.c')
-rw-r--r--linux/drivers/media/dvb/ttpci/budget-ci.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c
index 9a81a07f7..0ccc9db6e 100644
--- a/linux/drivers/media/dvb/ttpci/budget-ci.c
+++ b/linux/drivers/media/dvb/ttpci/budget-ci.c
@@ -34,6 +34,10 @@
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/input.h>
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 23)
+/* Fix compile warning */
+#undef BIT
+#endif
#include <linux/spinlock.h>
#include <media/ir-common.h>