- Linux/version.h removed. Replaced by linux/utsname.h

          where KERNEL_VERSION is required.
        - incremented versions for CX88, BTTV and SAA7134.

        * compat.h:
        - Included linux/version.h.

	This change is required to be compatible with
a patch applied at Kernel by Olaf Hering <olh@suse.de>
this patch does reduce kernel dependency of its version number.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

11 files changed, 42 insertions, 24 deletions

diff --git a/linux/drivers/media/common/ir-common.c b/linux/drivers/media/common/ir-common.c
index 6ee0b9c73..3adb6e753 100644
--- a/linux/drivers/media/common/ir-common.c
+++ b/linux/drivers/media/common/ir-common.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ir-common.c,v 1.11 2005/07/07 14:44:43 mchehab Exp $
+ * $Id: ir-common.c,v 1.12 2005/07/13 17:25:25 mchehab Exp $
  *
  * some common structs and functions to handle infrared remotes via
  * input layer ...
@@ -21,9 +21,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "compat.h"
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <media/ir-common.h>
 
 /* -------------------------------------------------------------------------- */
diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h
index 31235daf6..10e96a9b7 100644
--- a/linux/drivers/media/video/bttvp.h
+++ b/linux/drivers/media/video/bttvp.h
@@ -1,5 +1,5 @@
 /*
-    $Id: bttvp.h,v 1.19 2005/06/16 21:38:45 nsh Exp $
+    $Id: bttvp.h,v 1.20 2005/07/13 17:25:25 mchehab Exp $
 
     bttv - Bt848 frame grabber driver
 
@@ -26,8 +26,8 @@
 #ifndef _BTTVP_H_
 #define _BTTVP_H_
 
-#include <linux/version.h>
-#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,15)
+#include <linux/utsname.h>
+#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,16)
 
 #include <linux/types.h>
 #include <linux/wait.h>
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index 7dccbfdde..7b52fc278 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88.h,v 1.68 2005/07/07 14:17:47 mchehab Exp $
+ * $Id: cx88.h,v 1.69 2005/07/13 17:25:25 mchehab Exp $
  *
  * v4l2 device driver for cx2388x based TV cards
  *
@@ -36,8 +36,8 @@
 #include "btcx-risc.h"
 #include "cx88-reg.h"
 
-#include <linux/version.h>
-#define CX88_VERSION_CODE KERNEL_VERSION(0,0,4)
+#include <linux/utsname.h>
+#define CX88_VERSION_CODE KERNEL_VERSION(0,0,5)
 
 #ifndef TRUE
 # define TRUE (1==1)
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 370c47608..a9a4e3bcc 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134.h,v 1.48 2005/07/01 08:22:24 nsh Exp $
+ * $Id: saa7134.h,v 1.49 2005/07/13 17:25:25 mchehab Exp $
  *
  * v4l2 device driver for philips saa7134 based TV cards
  *
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/version.h>
-#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,13)
+#include <linux/utsname.h>
+#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,14)
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c
index b4720ed5b..8abeeb7da 100644
--- a/linux/drivers/media/video/tveeprom.c
+++ b/linux/drivers/media/video/tveeprom.c
@@ -28,7 +28,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/version.h>
+#include "compat.h"
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
diff --git a/linux/drivers/media/video/v4l1-compat.c b/linux/drivers/media/video/v4l1-compat.c
index 36b9cdb16..f911c767b 100644
--- a/linux/drivers/media/video/v4l1-compat.c
+++ b/linux/drivers/media/video/v4l1-compat.c
@@ -1,5 +1,5 @@
 /*
- * $Id: v4l1-compat.c,v 1.10 2005/06/22 22:58:04 mchehab Exp $
+ * $Id: v4l1-compat.c,v 1.11 2005/07/13 17:25:25 mchehab Exp $
  *
  *	Video for Linux Two
  *	Backward Compatibility Layer
@@ -19,7 +19,7 @@
 
 #include <linux/config.h>
 
-#include <linux/version.h>
+#include "compat.h"
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c
index 621c6b650..96d7847ef 100644
--- a/linux/drivers/media/video/v4l2-common.c
+++ b/linux/drivers/media/video/v4l2-common.c
@@ -45,7 +45,7 @@
  */
 
 #include <linux/config.h>
-#include <linux/version.h>
+#include "compat.h"
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h
index 9d2117da3..2b69e9f94 100644
--- a/linux/include/media/ir-common.h
+++ b/linux/include/media/ir-common.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ir-common.h,v 1.9 2005/05/15 19:01:26 mchehab Exp $
+ * $Id: ir-common.h,v 1.10 2005/07/13 17:25:25 mchehab Exp $
  *
  * some common structs and functions to handle infrared remotes via
  * input layer ...
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <linux/version.h>
+#include "compat.h"
 #include <linux/input.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index f14d55fbf..93f271f77 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,15 @@
+2005-07-13 17:11  Mauro Carvalho Chehab  <mchehab@brturbo.com.br>
+
+	* bttvp.h,cx88.h,dpl3518.c,ir-common.c, ir-common.h,
+	  saa7134.h, tveeprom.c, v4l1-compat.c, v4l2-common.c:
+	- linux/version.h removed.
+	- incremented versions for CX88, BTTV and SAA7134.
+
+	* compat.h:
+	- Included linux/version.h.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-07-13 13:22  mchehab
 	* tea5761.c:
 	- New tea chip added. Still needs testing and integration.
diff --git a/v4l/compat.h b/v4l/compat.h
index e268820b9..5b80bb6ad 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1,7 +1,13 @@
 /*
- * $Id: compat.h,v 1.12 2005/06/13 08:42:51 nsh Exp $
+ * $Id: compat.h,v 1.13 2005/07/13 17:25:25 mchehab Exp $
  */
 
+#ifndef _COMPAT_H
+#define _COMPAT_H
+
+#include <linux/i2c-id.h>
+#include <linux/version.h>
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)
 # define minor(x) MINOR(x)
 #endif
@@ -31,10 +37,6 @@
 # define  I2C_CLASS_TV_ANALOG  I2C_ADAP_CLASS_TV_ANALOG
 # define  I2C_CLASS_TV_DIGITAL I2C_ADAP_CLASS_TV_DIGITAL
 #endif
-#if !defined(I2C_HW_B_CX2388x)
-# define I2C_HW_B_CX2388x I2C_HW_B_BT848
-#endif
-
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
 # define __user
@@ -48,6 +50,9 @@
 # define PCI_D0                            (0)
 # define assert_spin_locked(foobar)
 #endif
+#if !defined(I2C_HW_B_CX2388x)
+# define I2C_HW_B_CX2388x I2C_HW_B_BT848
+#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
 #define __le32 __u32
@@ -96,6 +101,7 @@ static inline unsigned long msleep_interruptible(unsigned int msecs)
 }
 #endif
 
+#endif
 /*
  * Local variables:
  * c-basic-offset: 8
diff --git a/v4l_experimental/dpl3518.c b/v4l_experimental/dpl3518.c
index 5fb52b4b2..a7df1f078 100644
--- a/v4l_experimental/dpl3518.c
+++ b/v4l_experimental/dpl3518.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dpl3518.c,v 1.4 2005/06/18 06:00:36 nsh Exp $
+ * $Id: dpl3518.c,v 1.5 2005/07/13 17:25:25 mchehab Exp $
  *
  * programming the dpl3518a Dolby Pro Logic Processor
  *
@@ -32,7 +32,7 @@
 /* FIXME */
 #define DPL_MAJOR  127
 
-#include <linux/version.h>
+#include "compat.h"
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>