UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Krufky 2007-03-11 20:57:52 -03:00 committed by Mauro Carvalho Chehab
parent 2f52cdb209
commit 03121f05f9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/cx23885/cx23885-core.c
View 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;

2
drivers/media/video/cx23885/cx23885.h
View 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"