V4L/DVB (6075): tuner: kernel headers go above subsystem headers

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c
index 7549114..210a84d 100644 (file)
--- a/drivers/media/video/mt20xx.c
+++ b/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/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index 59cff5a..760d22f 100644 (file)
--- a/drivers/media/video/tda8290.c
+++ b/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/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index aa311e4..e8597c1 100644 (file)
--- a/drivers/media/video/tda9887.c
+++ b/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/drivers/media/video/tea5761.c b/drivers/media/video/tea5761.c
index ae105c2..43bdc37 100644 (file)
--- a/drivers/media/video/tea5761.c
+++ b/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/drivers/media/video/tea5767.c b/drivers/media/video/tea5767.c
index 4985d47..4c9c4e0 100644 (file)
--- a/drivers/media/video/tea5767.c
+++ b/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/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index e646465..5f37826 100644 (file)
--- a/drivers/media/video/tuner-core.c
+++ b/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/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 572f224..f1ee60a 100644 (file)
--- a/drivers/media/video/tuner-simple.c
+++ b/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>