diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-18 08:22:06 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-18 08:22:06 -0300 |
| commit | 96cbbc792854ad33325f55e2b095d27d195537e7 (patch) | |
| tree | 0a1a2b20fbc58ae19955e65e30193faf330fc26d /linux/drivers/media/dvb/dvb-core | |
| parent | 043941b563e911ccb213664f4471e985da89147a (diff) | |
| parent | f2ead120937d5077a260732019a12e6ed6c6752e (diff) | |
| download | mediapointer-dvb-s2-96cbbc792854ad33325f55e2b095d27d195537e7.tar.gz mediapointer-dvb-s2-96cbbc792854ad33325f55e2b095d27d195537e7.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c index 4fadddb26..423eaeb03 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c @@ -37,6 +37,7 @@ #include <linux/delay.h> #include <linux/spinlock.h> #include <linux/sched.h> +#include "compat.h" #include "dvb_ca_en50221.h" #include "dvb_ringbuffer.h" diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 564c57b79..b4165ddb3 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -211,7 +211,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, { struct dvb_device *dvbdev; struct file_operations *dvbdevfops; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,23) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) struct device *clsdev; #else struct class_device *clsdev; |