]> err.no Git - linux-2.6/commitdiff
V4L/DVB (6152): cx23885: forward compatibility fixes for recent kernels
authorMichael Krufky <mkrufky@linuxtv.org>
Sun, 11 Mar 2007 23:57:52 +0000 (20:57 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 10 Oct 2007 01:08:00 +0000 (22:08 -0300)
- 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>
drivers/media/video/cx23885/cx23885-core.c
drivers/media/video/cx23885/cx23885.h

index 876d396fb7a3276d9b48a5b30eeddea21dab69f9..4e6e8737e38e399e02f18995e56b59110d10194b 100644 (file)
@@ -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;
index f58ab86bd5328fe1550e627b08bdfaa85e3efa6d..769a0e7541c07fbc37352c500d77d4288ce8c47a 100644 (file)
@@ -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"