diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 6 | ||||
| -rw-r--r-- | v4l/versions.txt | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index bdad519e9..25c11f460 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -74,6 +74,12 @@ # define I2C_M_IGNORE_NAK 0x1000 #endif +/* v4l-dvb uses an out of kernel copy of i2c-id.h, which does not have + some stuff that previous versions of i2c-id.h defined. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) && defined(LINUX_I2C_ID_H) +# define I2C_ALGO_BIT 0x010000 +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) #define __le32 __u32 #endif diff --git a/v4l/versions.txt b/v4l/versions.txt index e30a74e85..07f8cdc38 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -43,6 +43,7 @@ USB_QUICKCAM_MESSENGER [2.6.15] USB_ZC0301 USB_ET61X251 +USB_ZR364XX [2.6.12] VIDEO_VIVI |