diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 12 | ||||
| -rw-r--r-- | v4l/compat.h | 16 |
2 files changed, 23 insertions, 5 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index f14d55fbf..93f271f77 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2005-07-13 17:11 Mauro Carvalho Chehab <mchehab@brturbo.com.br> + + * bttvp.h,cx88.h,dpl3518.c,ir-common.c, ir-common.h, + saa7134.h, tveeprom.c, v4l1-compat.c, v4l2-common.c: + - linux/version.h removed. + - incremented versions for CX88, BTTV and SAA7134. + + * compat.h: + - Included linux/version.h. + +Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-07-13 13:22 mchehab * tea5761.c: - New tea chip added. Still needs testing and integration. diff --git a/v4l/compat.h b/v4l/compat.h index e268820b9..5b80bb6ad 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,7 +1,13 @@ /* - * $Id: compat.h,v 1.12 2005/06/13 08:42:51 nsh Exp $ + * $Id: compat.h,v 1.13 2005/07/13 17:25:25 mchehab Exp $ */ +#ifndef _COMPAT_H +#define _COMPAT_H + +#include <linux/i2c-id.h> +#include <linux/version.h> + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18) # define minor(x) MINOR(x) #endif @@ -31,10 +37,6 @@ # define I2C_CLASS_TV_ANALOG I2C_ADAP_CLASS_TV_ANALOG # define I2C_CLASS_TV_DIGITAL I2C_ADAP_CLASS_TV_DIGITAL #endif -#if !defined(I2C_HW_B_CX2388x) -# define I2C_HW_B_CX2388x I2C_HW_B_BT848 -#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) # define __user @@ -48,6 +50,9 @@ # define PCI_D0 (0) # define assert_spin_locked(foobar) #endif +#if !defined(I2C_HW_B_CX2388x) +# define I2C_HW_B_CX2388x I2C_HW_B_BT848 +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) #define __le32 __u32 @@ -96,6 +101,7 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) } #endif +#endif /* * Local variables: * c-basic-offset: 8 |