aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
34#include <linux/sched.h> 34#include <linux/sched.h>
35#include <linux/interrupt.h> 35#include <linux/interrupt.h>
36#include <linux/kdev_t.h> 36#include <linux/kdev_t.h>
37#include "bttvp.h"
38
37#include <linux/dma-mapping.h> 39#include <linux/dma-mapping.h>
38 40
39#include <asm/io.h> 41#include <asm/io.h>
40#include <asm/byteorder.h> 42#include <asm/byteorder.h>
41 43
42#include "bttvp.h"
43
44#include "rds.h" 44#include "rds.h"
45 45
46 46
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 @@
28#include <linux/moduleparam.h> 28#include <linux/moduleparam.h>
29#include <linux/init.h> 29#include <linux/init.h>
30#include <linux/delay.h> 30#include <linux/delay.h>
31#include <linux/jiffies.h>
32#include <asm/io.h>
33 31
34#include "bttvp.h" 32#include "bttvp.h"
33#include <linux/jiffies.h>
34#include <asm/io.h>
35 35
36static struct i2c_algo_bit_data bttv_i2c_algo_bit_template; 36static struct i2c_algo_bit_data bttv_i2c_algo_bit_template;
37static struct i2c_adapter bttv_i2c_adap_sw_template; 37static struct i2c_adapter bttv_i2c_adap_sw_template;