From c774abc54b8803206774697b5403a6a8c68da1df Mon Sep 17 00:00:00 2001
From: Mike Isely <devnull@localhost>
Date: Sun, 1 Jan 2006 18:46:45 +0000
Subject: Patch pvrusb2 to compile again with centralized ioctl definitions

From: Mike Isely <isely@pobox.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Mike Isely <isely@pobox.com>
---
 v4l/ChangeLog                            | 11 +++++++++++
 v4l_experimental/pvrusb2/pvrusb2-audio.c |  3 ++-
 v4l_experimental/pvrusb2/pvrusb2-demod.c |  3 ++-
 v4l_experimental/pvrusb2/pvrusb2-tuner.c |  3 ++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index e8d63bd89..a5f148a3b 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-01 18:44  mcisely
+
+	* v4l_experimental/pvrusb2/pvrusb2-audio.c:
+	* v4l_experimental/pvrusb2/pvrusb2-demod.c:
+	* v4l_experimental/pvrusb2/pvrusb2-tuner.c:
+
+	-Patch pvrusb2 to compile again with centralized ioctl definitions
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+	Signed-off-by: Mike Isely <isely@pobox.com>
+
 2006-01-01 18:06  hverkuil
 
 	* linux/drivers/media/video/msp3400.c: (msp_reset), (msp_read),
diff --git a/v4l_experimental/pvrusb2/pvrusb2-audio.c b/v4l_experimental/pvrusb2/pvrusb2-audio.c
index 81408e1a6..af0547f1b 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-audio.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-audio.c
@@ -1,6 +1,6 @@
 /*
  *
- *  $Id: pvrusb2-audio.c,v 1.3 2006/01/01 08:26:03 mcisely Exp $
+ *  $Id: pvrusb2-audio.c,v 1.4 2006/01/01 18:46:45 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -26,6 +26,7 @@
 #include "msp3400.h"
 #include <linux/videodev.h>
 #include <media/audiochip.h>
+#include <media/v4l2-common.h>
 
 struct pvr2_msp3400_handler {
 	struct pvr2_hdw *hdw;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-demod.c b/v4l_experimental/pvrusb2/pvrusb2-demod.c
index f9f1fc844..4ee6c9eb6 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-demod.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-demod.c
@@ -1,6 +1,6 @@
 /*
  *
- *  $Id: pvrusb2-demod.c,v 1.1 2006/01/01 08:26:03 mcisely Exp $
+ *  $Id: pvrusb2-demod.c,v 1.2 2006/01/01 18:46:45 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -28,6 +28,7 @@
 #include "compat.h"
 #include <linux/videodev.h>
 #include <media/tuner.h>
+#include <media/v4l2-common.h>
 
 
 struct pvr2_demod_handler {
diff --git a/v4l_experimental/pvrusb2/pvrusb2-tuner.c b/v4l_experimental/pvrusb2/pvrusb2-tuner.c
index 232f083fd..9944d80bc 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-tuner.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-tuner.c
@@ -1,6 +1,6 @@
 /*
  *
- *  $Id: pvrusb2-tuner.c,v 1.7 2006/01/01 08:26:03 mcisely Exp $
+ *  $Id: pvrusb2-tuner.c,v 1.8 2006/01/01 18:46:45 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -28,6 +28,7 @@
 #include "compat.h"
 #include <linux/videodev.h>
 #include <media/tuner.h>
+#include <media/v4l2-common.h>
 
 
 struct pvr2_tuner_handler {
-- 
cgit v1.2.3