diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-02 06:01:57 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-02 06:01:57 -0300 |
commit | bb0211fef21b5bdaeac73958b01dd55c848e7528 (patch) | |
tree | 9019f6b354ea0684560e40992272fc2cdea1f978 /linux/drivers/media/dvb/ttpci | |
parent | 6ac3002c45d81596d94c48fedcdb200010793c23 (diff) | |
parent | d6db2f85c6d097e28ed29d23316c671db5539892 (diff) | |
download | mediapointer-dvb-s2-bb0211fef21b5bdaeac73958b01dd55c848e7528.tar.gz mediapointer-dvb-s2-bb0211fef21b5bdaeac73958b01dd55c848e7528.tar.bz2 |
merge: http://linuxtv.org/hg/~pb/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci')
-rw-r--r-- | linux/drivers/media/dvb/ttpci/budget-ci.c | 4 |
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> |