- linux/version.h removed at linux-2.6.13-rc3-mm1.

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

37 files changed, 75 insertions, 46 deletions

diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index 2344e1cbd..652fa8d5a 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-driver.c,v 1.43 2005/07/15 20:09:38 mchehab Exp $
+    $Id: bttv-driver.c,v 1.44 2005/07/15 21:44:14 mchehab Exp $
 
     bttv - Bt848 frame grabber driver
 
@@ -35,7 +35,6 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/kdev_t.h>
-#include <linux/pci.h>
 #include <linux/dma-mapping.h>
 
 #include <asm/io.h>
diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h
index 10e96a9b7..d12c21635 100644
--- a/linux/drivers/media/video/bttvp.h
+++ b/linux/drivers/media/video/bttvp.h
@@ -1,5 +1,5 @@
 /*
-    $Id: bttvp.h,v 1.20 2005/07/13 17:25:25 mchehab Exp $
+    $Id: bttvp.h,v 1.21 2005/07/15 21:44:14 mchehab Exp $
 
     bttv - Bt848 frame grabber driver
 
@@ -26,6 +26,7 @@
 #ifndef _BTTVP_H_
 #define _BTTVP_H_
 
+#include "compat.h"
 #include <linux/utsname.h>
 #define BTTV_VERSION_CODE KERNEL_VERSION(0,9,16)
 
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c
index c161a358a..58496bf1c 100644
--- a/linux/drivers/media/video/cx88/cx88-alsa.c
+++ b/linux/drivers/media/video/cx88/cx88-alsa.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-alsa.c,v 1.3 2004/10/13 10:39:00 kraxel Exp $
+ * $Id: cx88-alsa.c,v 1.4 2005/07/15 21:44:14 mchehab Exp $
  *
  *  Support for audio capture
  *  PCI function #1 of the cx2388x.
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <asm/delay.h>
 
+#include "compat.h"
 #include "cx88.h"
 
 /* ------------------------------------------------------------------ */
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c
index 91f8afede..3a0ad7162 100644
--- a/linux/drivers/media/video/cx88/cx88-blackbird.c
+++ b/linux/drivers/media/video/cx88/cx88-blackbird.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-blackbird.c,v 1.27 2005/06/03 13:31:50 mchehab Exp $
+ * $Id: cx88-blackbird.c,v 1.28 2005/07/15 21:44:14 mchehab Exp $
  *
  *  Support for a cx23416 mpeg encoder via cx2388x host port.
  *  "blackbird" reference design.
@@ -32,6 +32,7 @@
 #include <linux/device.h>
 #include <linux/firmware.h>
 
+#include "compat.h"
 #include "cx88.h"
 
 MODULE_DESCRIPTION("driver for cx2388x/cx23416 based mpeg encoder cards");
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 3d0c784b3..b2a8a7c3f 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-cards.c,v 1.86 2005/07/14 03:06:43 mchehab Exp $
+ * $Id: cx88-cards.c,v 1.87 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * card-specific stuff.
@@ -26,6 +26,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 
+#include "compat.h"
 #include "cx88.h"
 
 /* ------------------------------------------------------------------ */
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c
index a39613cf1..46f2a2279 100644
--- a/linux/drivers/media/video/cx88/cx88-core.c
+++ b/linux/drivers/media/video/cx88/cx88-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-core.c,v 1.33 2005/07/07 14:17:47 mchehab Exp $
+ * $Id: cx88-core.c,v 1.34 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * driver core
@@ -32,6 +32,7 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include "compat.h"
 #include <linux/videodev.h>
 
 #include "cx88.h"
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index ae2170fa9..5e15a8ea6 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-dvb.c,v 1.44 2005/07/15 20:06:05 mchehab Exp $
+ * $Id: cx88-dvb.c,v 1.45 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -35,6 +35,7 @@
 #define CONFIG_DVB_OR51132 1
 #define CONFIG_DVB_LGDT3302 1
 
+#include "compat.h"
 #include "cx88.h"
 #include "dvb-pll.h"
 
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c
index 8403c4e95..410ae0cc4 100644
--- a/linux/drivers/media/video/cx88/cx88-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-i2c.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cx88-i2c.c,v 1.28 2005/07/05 17:37:35 nsh Exp $
+    $Id: cx88-i2c.c,v 1.29 2005/07/15 21:44:14 mchehab Exp $
 
     cx88-i2c.c  --  all the i2c code is here
 
@@ -30,6 +30,7 @@
 
 #include <asm/io.h>
 
+#include "compat.h"
 #include "cx88.h"
 
 static unsigned int i2c_debug = 0;
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c
index af2c539d1..5e96ff101 100644
--- a/linux/drivers/media/video/cx88/cx88-mpeg.c
+++ b/linux/drivers/media/video/cx88/cx88-mpeg.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-mpeg.c,v 1.31 2005/07/07 14:17:47 mchehab Exp $
+ * $Id: cx88-mpeg.c,v 1.32 2005/07/15 21:44:14 mchehab Exp $
  *
  *  Support for the mpeg transport stream transfers
  *  PCI function #2 of the cx2388x.
@@ -30,6 +30,7 @@
 #include <linux/interrupt.h>
 #include <asm/delay.h>
 
+#include "compat.h"
 #include "cx88.h"
 
 /* ------------------------------------------------------------------ */
diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c
index 3775da8a3..8b02e005c 100644
--- a/linux/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cx88-tvaudio.c,v 1.37 2005/07/07 13:58:38 mchehab Exp $
+    $Id: cx88-tvaudio.c,v 1.38 2005/07/15 21:44:14 mchehab Exp $
 
     cx88x-audio.c - Conexant CX23880/23881 audio downstream driver driver
 
@@ -55,6 +55,7 @@
 #include <linux/delay.h>
 #include <linux/kthread.h>
 
+#include "compat.h"
 #include "cx88.h"
 
 static unsigned int audio_debug = 0;
diff --git a/linux/drivers/media/video/cx88/cx88-vbi.c b/linux/drivers/media/video/cx88/cx88-vbi.c
index 320d57888..800624d7c 100644
--- a/linux/drivers/media/video/cx88/cx88-vbi.c
+++ b/linux/drivers/media/video/cx88/cx88-vbi.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-vbi.c,v 1.17 2005/06/12 04:19:19 mchehab Exp $
+ * $Id: cx88-vbi.c,v 1.18 2005/07/15 21:44:14 mchehab Exp $
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -7,6 +7,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 
+#include "compat.h"
 #include "cx88.h"
 
 static unsigned int vbibufs = 4;
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index 818ee692c..01b85437f 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-video.c,v 1.80 2005/07/13 08:49:08 mchehab Exp $
+ * $Id: cx88-video.c,v 1.81 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * video4linux video interface
@@ -33,6 +33,7 @@
 #include <linux/kthread.h>
 #include <asm/div64.h>
 
+#include "compat.h"
 #include "cx88.h"
 
 MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards");
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 3f1cc2a32..702268d6a 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -45,6 +45,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 3f1cc2a32..702268d6a 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -45,6 +45,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
diff --git a/linux/drivers/media/video/mt20xx.c b/linux/drivers/media/video/mt20xx.c
index b1ded1b87..62a1e6f7f 100644
--- a/linux/drivers/media/video/mt20xx.c
+++ b/linux/drivers/media/video/mt20xx.c
@@ -1,15 +1,15 @@
 /*
- * $Id: mt20xx.c,v 1.5 2005/06/16 08:29:49 nsh Exp $
+ * $Id: mt20xx.c,v 1.6 2005/07/15 21:44:14 mchehab Exp $
  *
  * i2c tv tuner chip device driver
  * controls microtune tuners, mt2032 + mt2050 at the moment.
  */
 #include <linux/delay.h>
 #include <linux/i2c.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <linux/moduleparam.h>
 #include <media/tuner.h>
-#include "compat.h"
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/linux/drivers/media/video/saa6752hs.c b/linux/drivers/media/video/saa6752hs.c
index 99fe221eb..fe915dbe3 100644
--- a/linux/drivers/media/video/saa6752hs.c
+++ b/linux/drivers/media/video/saa6752hs.c
@@ -9,6 +9,7 @@
 #include <linux/poll.h>
 #include <linux/i2c.h>
 #include <linux/types.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
@@ -19,7 +20,6 @@
 #else
 #include <media/id.h>
 #endif
-#include "compat.h"
 
 #define MPEG_VIDEO_TARGET_BITRATE_MAX  27000
 #define MPEG_VIDEO_MAX_BITRATE_MAX     27000
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c
index 99fe221eb..fe915dbe3 100644
--- a/linux/drivers/media/video/saa7134/saa6752hs.c
+++ b/linux/drivers/media/video/saa7134/saa6752hs.c
@@ -9,6 +9,7 @@
 #include <linux/poll.h>
 #include <linux/i2c.h>
 #include <linux/types.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
@@ -19,7 +20,6 @@
 #else
 #include <media/id.h>
 #endif
-#include "compat.h"
 
 #define MPEG_VIDEO_TARGET_BITRATE_MAX  27000
 #define MPEG_VIDEO_MAX_BITRATE_MAX     27000
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index de69e3298..50157f7d9 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-cards.c,v 1.81 2005/07/08 20:21:33 mchehab Exp $
+ * $Id: saa7134-cards.c,v 1.82 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * card-specific stuff.
@@ -24,6 +24,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 
+#include "compat.h"
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c
index 689453f2f..7bee05e08 100644
--- a/linux/drivers/media/video/saa7134/saa7134-core.c
+++ b/linux/drivers/media/video/saa7134/saa7134-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-core.c,v 1.39 2005/07/05 17:37:35 nsh Exp $
+ * $Id: saa7134-core.c,v 1.40 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * driver core
@@ -33,6 +33,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 
+#include "compat.h"
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
index d6ebaf6b1..1424eb217 100644
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-dvb.c,v 1.19 2005/07/12 15:44:55 mkrufky Exp $
+ * $Id: saa7134-dvb.c,v 1.20 2005/07/15 21:44:14 mchehab Exp $
  *
  * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
  *
@@ -33,6 +33,7 @@
 #define CONFIG_DVB_MT352 1
 #define CONFIG_DVB_TDA1004X 1
 
+#include "compat.h"
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c
index d7ae9780d..6c61550cb 100644
--- a/linux/drivers/media/video/saa7134/saa7134-empress.c
+++ b/linux/drivers/media/video/saa7134/saa7134-empress.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-empress.c,v 1.11 2005/05/22 19:23:39 nsh Exp $
+ * $Id: saa7134-empress.c,v 1.12 2005/07/15 21:44:14 mchehab Exp $
  *
  * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
  *
@@ -26,6 +26,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 
+#include "compat.h"
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c
index ccfefaab7..5dab26242 100644
--- a/linux/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-i2c.c,v 1.19 2005/07/07 01:49:30 mkrufky Exp $
+ * $Id: saa7134-i2c.c,v 1.20 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * i2c interface support
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 
+#include "compat.h"
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index 1877852c3..bd59a8686 100644
--- a/linux/drivers/media/video/saa7134/saa7134-input.c
+++ b/linux/drivers/media/video/saa7134/saa7134-input.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-input.c,v 1.21 2005/06/22 23:37:34 nsh Exp $
+ * $Id: saa7134-input.c,v 1.22 2005/07/15 21:44:14 mchehab Exp $
  *
  * handle saa7134 IR remotes via linux kernel input layer.
  *
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/input.h>
 
+#include "compat.h"
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c
index b5bede95d..fddc8965b 100644
--- a/linux/drivers/media/video/saa7134/saa7134-oss.c
+++ b/linux/drivers/media/video/saa7134/saa7134-oss.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-oss.c,v 1.17 2005/06/28 23:41:47 mkrufky Exp $
+ * $Id: saa7134-oss.c,v 1.18 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * oss dsp interface
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/soundcard.h>
 
+#include "compat.h"
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-ts.c b/linux/drivers/media/video/saa7134/saa7134-ts.c
index 4dd9f1b23..7e611bc61 100644
--- a/linux/drivers/media/video/saa7134/saa7134-ts.c
+++ b/linux/drivers/media/video/saa7134/saa7134-ts.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-ts.c,v 1.15 2005/06/14 22:48:18 hhackmann Exp $
+ * $Id: saa7134-ts.c,v 1.16 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * video4linux video interface
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 
+#include "compat.h"
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
index b320e06f8..1c84be284 100644
--- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-tvaudio.c,v 1.30 2005/06/28 23:41:47 mkrufky Exp $
+ * $Id: saa7134-tvaudio.c,v 1.31 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * tv audio decoder (fm stereo, nicam, ...)
@@ -31,6 +31,7 @@
 #include <linux/smp_lock.h>
 #include <asm/div64.h>
 
+#include "compat.h"
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-vbi.c b/linux/drivers/media/video/saa7134/saa7134-vbi.c
index 3c33c591c..125a6c838 100644
--- a/linux/drivers/media/video/saa7134/saa7134-vbi.c
+++ b/linux/drivers/media/video/saa7134/saa7134-vbi.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-vbi.c,v 1.7 2005/05/24 23:13:06 nsh Exp $
+ * $Id: saa7134-vbi.c,v 1.8 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * video4linux video interface
@@ -28,6 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 
+#include "compat.h"
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c
index 9a1d0a13e..7934f3b7e 100644
--- a/linux/drivers/media/video/saa7134/saa7134-video.c
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-video.c,v 1.36 2005/06/28 23:41:47 mkrufky Exp $
+ * $Id: saa7134-video.c,v 1.37 2005/07/15 21:44:14 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * video4linux video interface
@@ -28,6 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 
+#include "compat.h"
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
diff --git a/linux/drivers/media/video/tda8290.c b/linux/drivers/media/video/tda8290.c
index aefb9344b..c4fb4ecb6 100644
--- a/linux/drivers/media/video/tda8290.c
+++ b/linux/drivers/media/video/tda8290.c
@@ -1,14 +1,14 @@
 /*
- * $Id: tda8290.c,v 1.15 2005/07/08 20:21:33 mchehab Exp $
+ * $Id: tda8290.c,v 1.16 2005/07/15 21:44:14 mchehab Exp $
  *
  * i2c tv tuner chip device driver
  * controls the philips tda8290+75 tuner chip combo.
  */
 #include <linux/i2c.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <linux/delay.h>
 #include <media/tuner.h>
-#include "compat.h"
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index bc2c4badf..001cfce64 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -3,6 +3,7 @@
 #include <linux/kernel.h>
 #include <linux/i2c.h>
 #include <linux/types.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <linux/init.h>
 #include <linux/errno.h>
diff --git a/linux/drivers/media/video/tea5761.c b/linux/drivers/media/video/tea5761.c
index 317abdfa7..f93980538 100644
--- a/linux/drivers/media/video/tea5761.c
+++ b/linux/drivers/media/video/tea5761.c
@@ -2,7 +2,7 @@
  * For Philips TEA5761 FM Chip
  * I2C address is allways 0x20 (0x10 at 7-bit mode).
  *
- * $Id: tea5761.c,v 1.1 2005/07/13 13:25:18 mchehab Exp $
+ * $Id: tea5761.c,v 1.2 2005/07/15 21:44:14 mchehab Exp $
  *
  * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)
  * This code is placed under the terms of the GNU General Public License
@@ -11,6 +11,7 @@
  * from their contributions on DScaler.
  */
 
+#include "compat.h"
 #include <linux/i2c.h>
 #include <linux/videodev.h>
 #include <linux/delay.h>
diff --git a/linux/drivers/media/video/tea5767.c b/linux/drivers/media/video/tea5767.c
index 4d27ac1b7..b84a89536 100644
--- a/linux/drivers/media/video/tea5767.c
+++ b/linux/drivers/media/video/tea5767.c
@@ -2,7 +2,7 @@
  * For Philips TEA5767 FM Chip used on some TV Cards like Prolink Pixelview
  * I2C address is allways 0xC0.
  *
- * $Id: tea5767.c,v 1.21 2005/07/14 03:06:43 mchehab Exp $
+ * $Id: tea5767.c,v 1.22 2005/07/15 21:44:14 mchehab Exp $
  *
  * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)
  * This code is placed under the terms of the GNU General Public License
@@ -12,10 +12,10 @@
  */
 
 #include <linux/i2c.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <linux/delay.h>
 #include <media/tuner.h>
-#include <media/tuner.h>
 
 #define PREFIX "TEA5767 "
 
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index eac0b83bb..525412c39 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tuner-core.c,v 1.59 2005/07/15 20:09:38 mchehab Exp $
+ * $Id: tuner-core.c,v 1.60 2005/07/15 21:44:14 mchehab Exp $
  *
  * i2c tv tuner chip device driver
  * core core, i.e. kernel interfaces, registering and so on
@@ -17,12 +17,12 @@
 #include <linux/poll.h>
 #include <linux/i2c.h>
 #include <linux/types.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <linux/init.h>
 
 #include <media/tuner.h>
 #include <media/audiochip.h>
-#include "compat.h"
 
 #define UNSET (-1U)
 
@@ -656,9 +656,9 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 }
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-static int tuner_suspend(struct device * dev, u32 state, u32 level)
+static int tuner_suspend(struct device *dev, u32 state, u32 level)
 #else
-static int tuner_suspend(struct device * dev, pm_message_t state, u32 level)
+static int tuner_suspend(struct device *dev, pm_message_t state, u32 level)
 #endif
 {
 	struct i2c_client *c = container_of (dev, struct i2c_client, dev);
diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c
index 316483e5f..cea99fc88 100644
--- a/linux/drivers/media/video/tuner-simple.c
+++ b/linux/drivers/media/video/tuner-simple.c
@@ -1,14 +1,14 @@
 /*
- * $Id: tuner-simple.c,v 1.39 2005/07/07 01:49:30 mkrufky Exp $
+ * $Id: tuner-simple.c,v 1.40 2005/07/15 21:44:14 mchehab Exp $
  *
  * i2c tv tuner chip device driver
  * controls all those simple 4-control-bytes style tuners.
  */
 #include <linux/delay.h>
 #include <linux/i2c.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <media/tuner.h>
-#include "compat.h"
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c
index 8f8bc73ff..283726ce5 100644
--- a/linux/drivers/media/video/tvaudio.c
+++ b/linux/drivers/media/video/tvaudio.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
diff --git a/linux/drivers/media/video/tvmixer.c b/linux/drivers/media/video/tvmixer.c
index 9b3c01252..25402dcca 100644
--- a/linux/drivers/media/video/tvmixer.c
+++ b/linux/drivers/media/video/tvmixer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tvmixer.c,v 1.8 2005/06/12 04:19:19 mchehab Exp $
+ * $Id: tvmixer.c,v 1.9 2005/07/15 21:44:14 mchehab Exp $
  */
 
 #include <linux/module.h>
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include "compat.h"
 #include <linux/videodev.h>
 #include <linux/init.h>
 #include <linux/kdev_t.h>
diff --git a/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/video-buf-dvb.c
index 61e6b62b7..01b19c58d 100644
--- a/linux/drivers/media/video/video-buf-dvb.c
+++ b/linux/drivers/media/video/video-buf-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: video-buf-dvb.c,v 1.11 2005/07/07 01:49:30 mkrufky Exp $
+ * $Id: video-buf-dvb.c,v 1.12 2005/07/15 21:44:14 mchehab Exp $
  *
  * some helper function for simple DVB cards which simply DMA the
  * complete transport stream and let the computer sort everything else
@@ -22,6 +22,7 @@
 #include <linux/file.h>
 #include <linux/suspend.h>
 
+#include "compat.h"
 #include <media/video-buf.h>
 #include <media/video-buf-dvb.h>
 
@@ -62,13 +63,13 @@ static int videobuf_dvb_thread(void *data)
 			break;
 		if (kthread_should_stop())
 			break;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
+		try_to_freeze();
+#else
 		if (current->flags & PF_FREEZE) {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12)
 			refrigerator (PF_FREEZE);
-#else
-			refrigerator ();
-#endif
 		}
+#endif
 
 		/* feed buffer data to demux */
 		if (buf->state == STATE_DONE)
@@ -156,14 +157,15 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,
 	}
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
 	dvb->adapter.priv = adapter_priv;
+
 	/* register frontend */
 	result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
 #else
 	dvb->adapter->priv = adapter_priv;
+
 	/* register frontend */
 	result = dvb_register_frontend(dvb->adapter, dvb->frontend);
 #endif
-
 	if (result < 0) {
 		printk(KERN_WARNING "%s: dvb_register_frontend failed (errno = %d)\n",
 		       dvb->name, result);