From bb0bc3ae6c7e9612043c3d1146c379fb3e23e3bf Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 21 Aug 2007 01:14:12 -0300
Subject: [PATCH] --- yaml --- r: 65778 b: refs/heads/master c:
 ffbb807c1362a2b64b473c0e093c496a4c7de4bb h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/mt20xx.c       | 2 +-
 trunk/drivers/media/video/tda8290.c      | 2 +-
 trunk/drivers/media/video/tda9887.c      | 3 +--
 trunk/drivers/media/video/tea5761.c      | 2 +-
 trunk/drivers/media/video/tea5767.c      | 2 +-
 trunk/drivers/media/video/tuner-core.c   | 3 +--
 trunk/drivers/media/video/tuner-simple.c | 1 +
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 5c75b72f1770..7a1a4aba8213 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c996899d0bc2414c7ff4682500344eb912d5ee1d
+refs/heads/master: ffbb807c1362a2b64b473c0e093c496a4c7de4bb
diff --git a/trunk/drivers/media/video/mt20xx.c b/trunk/drivers/media/video/mt20xx.c
index 7549114aaaca..210a84d8b971 100644
--- a/trunk/drivers/media/video/mt20xx.c
+++ b/trunk/drivers/media/video/mt20xx.c
@@ -5,8 +5,8 @@
  */
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/videodev.h>
 #include <linux/moduleparam.h>
+#include <linux/videodev.h>
 #include "tuner-driver.h"
 
 /* ---------------------------------------------------------------------- */
diff --git a/trunk/drivers/media/video/tda8290.c b/trunk/drivers/media/video/tda8290.c
index 59cff5a3c59e..760d22f65da2 100644
--- a/trunk/drivers/media/video/tda8290.c
+++ b/trunk/drivers/media/video/tda8290.c
@@ -19,8 +19,8 @@
 */
 
 #include <linux/i2c.h>
-#include <linux/videodev.h>
 #include <linux/delay.h>
+#include <linux/videodev.h>
 #include "tuner-driver.h"
 
 /* ---------------------------------------------------------------------- */
diff --git a/trunk/drivers/media/video/tda9887.c b/trunk/drivers/media/video/tda9887.c
index aa311e4f1f61..e8597c10aa4c 100644
--- a/trunk/drivers/media/video/tda9887.c
+++ b/trunk/drivers/media/video/tda9887.c
@@ -3,12 +3,11 @@
 #include <linux/kernel.h>
 #include <linux/i2c.h>
 #include <linux/types.h>
-#include <linux/videodev.h>
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-
+#include <linux/videodev.h>
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
 #include "tuner-driver.h"
diff --git a/trunk/drivers/media/video/tea5761.c b/trunk/drivers/media/video/tea5761.c
index ae105c2cd0ac..43bdc374927e 100644
--- a/trunk/drivers/media/video/tea5761.c
+++ b/trunk/drivers/media/video/tea5761.c
@@ -8,8 +8,8 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/videodev.h>
 #include <linux/delay.h>
+#include <linux/videodev.h>
 #include <media/tuner.h>
 #include "tuner-driver.h"
 
diff --git a/trunk/drivers/media/video/tea5767.c b/trunk/drivers/media/video/tea5767.c
index 4985d47a508f..4c9c4e01331a 100644
--- a/trunk/drivers/media/video/tea5767.c
+++ b/trunk/drivers/media/video/tea5767.c
@@ -11,8 +11,8 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/videodev.h>
 #include <linux/delay.h>
+#include <linux/videodev.h>
 #include "tuner-driver.h"
 
 #define PREFIX "TEA5767 "
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index e646465464a1..5f378265d8c5 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -15,9 +15,8 @@
 #include <linux/poll.h>
 #include <linux/i2c.h>
 #include <linux/types.h>
-#include <linux/videodev.h>
 #include <linux/init.h>
-
+#include <linux/videodev.h>
 #include <media/tuner.h>
 #include <media/v4l2-common.h>
 #include "tuner-driver.h"
diff --git a/trunk/drivers/media/video/tuner-simple.c b/trunk/drivers/media/video/tuner-simple.c
index 572f22423b98..f1ee60a4aa76 100644
--- a/trunk/drivers/media/video/tuner-simple.c
+++ b/trunk/drivers/media/video/tuner-simple.c
@@ -5,6 +5,7 @@
  */
 #include <linux/delay.h>
 #include <linux/i2c.h>
+#include <linux/moduleparam.h>
 #include <linux/videodev.h>
 #include <media/tuner.h>
 #include <media/v4l2-common.h>