summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-09 18:25:20 +0100
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-09 18:25:20 +0100
commitb5b8ab8d93ec46fec279b22eb1a613be18f49f7a (patch)
tree2fb2ea84e5029515d4969a629328e0968692acdc /drivers/media
parentV4L/DVB (3118): Enable remote control on AVERTV STUDIO 303 (diff)
downloadlinux-b5b8ab8d93ec46fec279b22eb1a613be18f49f7a.tar.xz
linux-b5b8ab8d93ec46fec279b22eb1a613be18f49f7a.zip
V4L/DVB (3123): include reorder to be in sync with V4L tree
- include reorder to be in sync with V4L tree Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/bttv-driver.c4
-rw-r--r--drivers/media/video/bttv-i2c.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index b93f4b5c0386..47347674a5e0 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -34,13 +34,13 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/kdev_t.h>
+#include "bttvp.h"
+
#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <asm/byteorder.h>
-#include "bttvp.h"
-
#include "rds.h"
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index d6418c023d39..8bb055de8d84 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -28,10 +28,10 @@
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/delay.h>
-#include <linux/jiffies.h>
-#include <asm/io.h>
#include "bttvp.h"
+#include <linux/jiffies.h>
+#include <asm/io.h>
static struct i2c_algo_bit_data bttv_i2c_algo_bit_template;
static struct i2c_adapter bttv_i2c_adap_sw_template;