diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2007-03-11 19:57:52 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2007-03-11 19:57:52 -0400 |
| commit | f4dfb265d303db700c16db3d8224c1d6093df124 (patch) | |
| tree | e0ee983e5beb30801e0fd0f79ecfb9042f578de8 /linux/drivers/media/video/cx23885 | |
| parent | bf57046a483cd176299450a6580ff8d363ae41f3 (diff) | |
| download | mediapointer-dvb-s2-f4dfb265d303db700c16db3d8224c1d6093df124.tar.gz mediapointer-dvb-s2-f4dfb265d303db700c16db3d8224c1d6093df124.tar.bz2 | |
cx23885: forward compatibility fixes for recent kernels
From: Michael Krufky <mkrufky@linuxtv.org>
- fix #include for <media/video-buf-dvb.h>
- fix cx23885_irq declaration for 2.6.19 and later
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/cx23885')
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c index d5ba3d804..6ebb63c25 100644 --- a/linux/drivers/media/video/cx23885/cx23885-core.c +++ b/linux/drivers/media/video/cx23885/cx23885-core.c @@ -1382,7 +1382,11 @@ static void cx23885_timeout(unsigned long data) #define VID_C_MSK_RISCI2 (1 << 4) #define VID_C_MSK_RISCI1 1 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static irqreturn_t cx23885_irq(int irq, void *dev_id, struct pt_regs *regs) +#else +static irqreturn_t cx23885_irq(int irq, void *dev_id) +#endif { struct cx23885_dev *dev = dev_id; struct cx23885_tsport *port = &dev->ts2; diff --git a/linux/drivers/media/video/cx23885/cx23885.h b/linux/drivers/media/video/cx23885/cx23885.h index 3b3eb54bb..adcb31bf6 100644 --- a/linux/drivers/media/video/cx23885/cx23885.h +++ b/linux/drivers/media/video/cx23885/cx23885.h @@ -28,7 +28,7 @@ #include <media/tuner.h> #include <media/tveeprom.h> #include <media/video-buf.h> -#ifdef HAVE_VIDEO_BUF_DVB +#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) #include <media/video-buf-dvb.h> #endif #include "compat.h" |