4 files changed, 13 insertions, 5 deletions
diff --git a/v4l_experimental/pvrusb2/pvrusb2-audio.c b/v4l_experimental/pvrusb2/pvrusb2-audio.c
index 3ef8fa74c..e48b4973e 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.5 2006/01/01 22:37:19 mcisely Exp $
+ *  $Id: pvrusb2-audio.c,v 1.6 2006/01/03 05:56:32 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -20,13 +20,16 @@
  *
  */
 
+#include "compat.h"
 #include "pvrusb2-audio.h"
 #include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-debug.h"
 #include "msp3400.h"
 #include <linux/videodev.h>
 #include <media/audiochip.h>
+#ifndef PVR2_SUPPRESS_V4L2COMMON
 #include <media/v4l2-common.h>
+#endif
 
 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 4ee6c9eb6..f11a21cd4 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.2 2006/01/01 18:46:45 mcisely Exp $
+ *  $Id: pvrusb2-demod.c,v 1.3 2006/01/03 05:56:32 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -28,7 +28,9 @@
 #include "compat.h"
 #include <linux/videodev.h>
 #include <media/tuner.h>
+#ifndef PVR2_SUPPRESS_V4L2COMMON
 #include <media/v4l2-common.h>
+#endif
 
 
 struct pvr2_demod_handler {
diff --git a/v4l_experimental/pvrusb2/pvrusb2-tuner.c b/v4l_experimental/pvrusb2/pvrusb2-tuner.c
index 9944d80bc..dd68aa34d 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.8 2006/01/01 18:46:45 mcisely Exp $
+ *  $Id: pvrusb2-tuner.c,v 1.9 2006/01/03 05:56:32 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -28,8 +28,9 @@
 #include "compat.h"
 #include <linux/videodev.h>
 #include <media/tuner.h>
+#ifndef PVR2_SUPPRESS_V4L2COMMON
 #include <media/v4l2-common.h>
-
+#endif
 
 struct pvr2_tuner_handler {
 	struct pvr2_hdw *hdw;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c
index ff042f3e8..4b21094a0 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c
@@ -1,6 +1,6 @@
 /*
  *
- *  $Id: pvrusb2-video-v4l.c,v 1.7 2006/01/01 22:37:19 mcisely Exp $
+ *  $Id: pvrusb2-video-v4l.c,v 1.8 2006/01/03 05:56:32 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -35,7 +35,9 @@
 #include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-debug.h"
 #include <linux/videodev.h>
+#ifndef PVR2_SUPPRESS_V4L2COMMON
 #include <media/v4l2-common.h>
+#endif
 #include <linux/errno.h>
 #include <linux/slab.h>