From 14589615f389499ed94b311f43ee735a9541c960 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 11 Mar 2007 20:57:52 -0300
Subject: [PATCH] --- yaml --- r: 65842 b: refs/heads/master c:
 03121f05f98cf9bba8f0fe77ef381c17681e1386 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/video/cx23885/cx23885-core.c | 2 +-
 trunk/drivers/media/video/cx23885/cx23885.h      | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index acbd418067b8..5230d3831bae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f52cdb20955b024e6b48f4e3d797504c8568a6d
+refs/heads/master: 03121f05f98cf9bba8f0fe77ef381c17681e1386
diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c
index 876d396fb7a3..4e6e8737e38e 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-core.c
+++ b/trunk/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/trunk/drivers/media/video/cx23885/cx23885.h b/trunk/drivers/media/video/cx23885/cx23885.h
index f58ab86bd532..769a0e7541c0 100644
--- a/trunk/drivers/media/video/cx23885/cx23885.h
+++ b/trunk/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"