From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

Include reorder to be in sync with V4L tree

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/media/video/bttv-driver.c |    4 ++--
 drivers/media/video/bttv-i2c.c    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -puN drivers/media/video/bttv-driver.c~v4l-dvb-3123-include-reorder-to-be-in-sync-with drivers/media/video/bttv-driver.c
--- devel/drivers/media/video/bttv-driver.c~v4l-dvb-3123-include-reorder-to-be-in-sync-with	2005-12-09 22:51:26.000000000 -0800
+++ devel-akpm/drivers/media/video/bttv-driver.c	2005-12-09 22:51:26.000000000 -0800
@@ -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 -puN drivers/media/video/bttv-i2c.c~v4l-dvb-3123-include-reorder-to-be-in-sync-with drivers/media/video/bttv-i2c.c
--- devel/drivers/media/video/bttv-i2c.c~v4l-dvb-3123-include-reorder-to-be-in-sync-with	2005-12-09 22:51:26.000000000 -0800
+++ devel-akpm/drivers/media/video/bttv-i2c.c	2005-12-09 22:51:26.000000000 -0800
@@ -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;
_