diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttv-i2c.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
3 files changed, 15 insertions, 6 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index e0865757a..241a163aa 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.76 2005/12/07 11:18:39 mchehab Exp $ + $Id: bttv-driver.c,v 1.77 2005/12/07 12:03:24 mchehab Exp $ bttv - Bt848 frame grabber driver @@ -35,6 +35,8 @@ #include <linux/sched.h> #include <linux/interrupt.h> #include <linux/kdev_t.h> +#include "bttvp.h" + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #include <linux/dma-mapping.h> #endif @@ -42,8 +44,6 @@ #include <asm/io.h> #include <asm/byteorder.h> -#include "bttvp.h" - #include "rds.h" diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c index a917b05bf..37acbbd53 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.36 2005/12/07 11:18:39 mchehab Exp $ + $Id: bttv-i2c.c,v 1.37 2005/12/07 12:03:24 mchehab Exp $ bttv-i2c.c -- all the i2c code is here @@ -29,13 +29,13 @@ #include <linux/moduleparam.h> #include <linux/init.h> #include <linux/delay.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; static struct i2c_adapter bttv_i2c_adap_hw_template; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 924c1964e..b3264f937 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-12-07 12:01 mchehab + + * linux/drivers/media/video/bttv-driver.c: + * linux/drivers/media/video/bttv-i2c.c: + + - include reorder to make it compile again. + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-12-07 11:49 mchehab * linux/drivers/media/video/compat_ioctl32.c: (native_ioctl), |