diff options
author | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-07 11:18:39 +0000 |
---|---|---|
committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-07 11:18:39 +0000 |
commit | 612cbef536b856016be222ee2da010e9a34c433b (patch) | |
tree | a0cb496321fc6a7a5478f34e071579391c6336a3 /linux/drivers/media/video/bttv-i2c.c | |
parent | c8a7226f04acafa57d87b656dd841d07f747b0c1 (diff) | |
download | mediapointer-dvb-s2-612cbef536b856016be222ee2da010e9a34c433b.tar.gz mediapointer-dvb-s2-612cbef536b856016be222ee2da010e9a34c433b.tar.bz2 |
Syncs bttv stuff with kernel version.
kernel-sync
- Syncs bttv stuff with kernel version.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/bttv-i2c.c')
-rw-r--r-- | linux/drivers/media/video/bttv-i2c.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c index cfd8250af..a917b05bf 100644 --- a/linux/drivers/media/video/bttv-i2c.c +++ b/linux/drivers/media/video/bttv-i2c.c @@ -1,5 +1,5 @@ /* - $Id: bttv-i2c.c,v 1.35 2005/10/31 16:13:15 nsh Exp $ + $Id: bttv-i2c.c,v 1.36 2005/12/07 11:18:39 mchehab Exp $ bttv-i2c.c -- all the i2c code is here @@ -29,12 +29,12 @@ #include <linux/moduleparam.h> #include <linux/init.h> #include <linux/delay.h> -#include <asm/io.h> - -#include "bttvp.h" #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #include <linux/jiffies.h> #endif +#include <asm/io.h> + +#include "bttvp.h" static struct i2c_algo_bit_data bttv_i2c_algo_bit_template; static struct i2c_adapter bttv_i2c_adap_sw_template; |