summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
-rw-r--r--drivers/media/video/em28xx/em28xx-core.c2
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c2
-rw-r--r--drivers/media/video/tveeprom.c2
-rw-r--r--drivers/media/video/tvp5150.c1
5 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index b6d89decfbd..7333bbad887 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -29,8 +29,8 @@
#include <linux/i2c.h>
#include <linux/usb.h>
#include <media/tuner.h>
-#include "audiochip.h"
-#include "tveeprom.h"
+#include <media/audiochip.h>
+#include <media/tveeprom.h>
#include "msp3400.h"
#include "em2820.h"
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index a75a91da70e..7913740e672 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -26,9 +26,9 @@
#include <linux/list.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/videodev.h>
#include <linux/usb.h>
#include <linux/vmalloc.h>
+#include <linux/videodev.h>
#include "em2820.h"
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index a000131a8f5..3fc58c67e6c 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -27,8 +27,8 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/usb.h>
-#include <linux/videodev.h>
#include <linux/i2c.h>
+#include <linux/videodev.h>
#include <media/tuner.h>
#include <linux/video_decoder.h>
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index a9bad89b4d6..ee605712bf1 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -40,7 +40,7 @@
#include <media/tuner.h>
#include <media/tveeprom.h>
-#include "audiochip.h"
+#include <media/audiochip.h>
MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver");
MODULE_AUTHOR("John Klar");
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 03f360b45fd..81e6d4494e7 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -5,7 +5,6 @@
* This code is placed under the terms of the GNU General Public License
*/
-#include <linux/videodev.h>
#include <linux/i2c.h>
#include <linux/videodev.h>
#include <linux/delay.h>