diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2007-03-11 19:57:52 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 21:08:00 -0400 |
| commit | 03121f05f98cf9bba8f0fe77ef381c17681e1386 (patch) | |
| tree | 68d5a4a7807ab562e9a40fdc8a14129e90cb691d /drivers/media/video/cx23885/cx23885-core.c | |
| parent | 2f52cdb20955b024e6b48f4e3d797504c8568a6d (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/cx23885-core.c')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index 876d396fb7a3..4e6e8737e38e 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) | |||
| 1361 | #define VID_C_MSK_RISCI2 (1 << 4) | 1361 | #define VID_C_MSK_RISCI2 (1 << 4) |
| 1362 | #define VID_C_MSK_RISCI1 1 | 1362 | #define VID_C_MSK_RISCI1 1 |
| 1363 | 1363 | ||
| 1364 | static irqreturn_t cx23885_irq(int irq, void *dev_id, struct pt_regs *regs) | 1364 | static irqreturn_t cx23885_irq(int irq, void *dev_id) |
| 1365 | { | 1365 | { |
| 1366 | struct cx23885_dev *dev = dev_id; | 1366 | struct cx23885_dev *dev = dev_id; |
| 1367 | struct cx23885_tsport *port = &dev->ts2; | 1367 | struct cx23885_tsport *port = &dev->ts2; |