Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03121f05 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

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: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 2f52cdb2

drivers/media/video/cx23885/cx23885-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/cx23885/cx23885.h

+2 −0
Original line number Diff line number Diff line
@@ -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"