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:07:32 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-02 06:07:32 -0300
commit9f41018ff536a6dd3b8b7907d6b190c7164297a1 (patch)
tree033193331de23e4c176a0f231d7a3a16b0eef332 /linux/drivers/media/dvb/ttpci/budget-ci.c
parent05a867e17e137e3eabac744773524c5c1abdc930 (diff)
parentbb0211fef21b5bdaeac73958b01dd55c848e7528 (diff)
downloadmediapointer-dvb-s2-9f41018ff536a6dd3b8b7907d6b190c7164297a1.tar.gz
mediapointer-dvb-s2-9f41018ff536a6dd3b8b7907d6b190c7164297a1.tar.bz2
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@redhat.com> 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>