aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/cx23885
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-03-11 20:57:52 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 22:08:00 -0300
commit03121f05f98cf9bba8f0fe77ef381c17681e1386 (patch)
tree68d5a4a7807ab562e9a40fdc8a14129e90cb691d /drivers/media/video/cx23885
parent2f52cdb20955b024e6b48f4e3d797504c8568a6d (diff)
V4L/DVB (6152): cx23885: forward compatibility fixes for recent kernels
- 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r--drivers/media/video/cx23885/cx23885-core.c2
-rw-r--r--drivers/media/video/cx23885/cx23885.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 876d396fb7a..4e6e8737e38 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1361,7 +1361,7 @@ static void cx23885_timeout(unsigned long data)
#define VID_C_MSK_RISCI2 (1 << 4)
#define VID_C_MSK_RISCI1 1
-static irqreturn_t cx23885_irq(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t cx23885_irq(int irq, void *dev_id)
{
struct cx23885_dev *dev = dev_id;
struct cx23885_tsport *port = &dev->ts2;
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index f58ab86bd53..769a0e7541c 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -28,7 +28,9 @@
#include <media/tuner.h>
#include <media/tveeprom.h>
#include <media/video-buf.h>
+#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
#include <media/video-buf-dvb.h>
+#endif
#include "btcx-risc.h"
#include "cx23885-reg.h"