diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-02 06:00:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-02 06:00:26 -0300 |
| commit | d6db2f85c6d097e28ed29d23316c671db5539892 (patch) | |
| tree | f86892b35f315d48fcc33c5de49489497b90600e /linux/drivers/media/dvb | |
| parent | 3480f0f25f38352a5357c25c8a0c8a93246e7542 (diff) | |
| parent | 039647d64a2b2e7065e250580e0d10b9f3320af7 (diff) | |
| download | mediapointer-dvb-s2-d6db2f85c6d097e28ed29d23316c671db5539892.tar.gz mediapointer-dvb-s2-d6db2f85c6d097e28ed29d23316c671db5539892.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/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')
| -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> |