diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-02-16 21:49:31 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2008-02-16 21:49:31 -0500 |
| commit | 381bcd3aa9c4c844cb415342a0ab21622c596488 (patch) | |
| tree | 75e79ed984e931dc37c254639d99d63d59c4aba6 /v4l | |
| parent | 7e39be7b7313d51ad3be46803a5918f1b2914b82 (diff) | |
| parent | 18ac0ef62eca3a89e0bf1f3c23bb7004e760d15b (diff) | |
| download | mediapointer-dvb-s2-381bcd3aa9c4c844cb415342a0ab21622c596488.tar.gz mediapointer-dvb-s2-381bcd3aa9c4c844cb415342a0ab21622c596488.tar.bz2 | |
merge: ~stoth/pci-nano
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 12 | ||||
| -rw-r--r-- | v4l/versions.txt | 9 |
2 files changed, 20 insertions, 1 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index cd3a7ac86..581262bdf 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -14,6 +14,11 @@ #include <linux/i2c-dev.h> #endif +/* To allow alsa code to work */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) +#include <sound/driver.h> +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) # define set_freezable() #endif @@ -494,6 +499,13 @@ do { \ # define BIT_WORD(nr) ((nr) / BITS_PER_LONG) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) +#define i2c_verify_client(dev) \ + ((dev->bus == &i2c_bus_type) ? to_i2c_client(dev) : NULL) +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) +#define i2c_verify_client(dev) \ + ((dev->bus && 0 == strcmp(dev->bus->name, "i2c")) ? to_i2c_client(dev) : NULL) +#endif #ifndef USB_DEVICE_AND_INTERFACE_INFO # define USB_DEVICE_AND_INTERFACE_INFO(vend,prod,cl,sc,pr) \ diff --git a/v4l/versions.txt b/v4l/versions.txt index 958be1de9..1637793c1 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -3,11 +3,17 @@ # This driver is marked at kernel as broken VIDEO_PLANB +[2.6.25] +# Requires gpiolib +SOC_CAMERA +SOC_CAMERA_MT9V022 +SOC_CAMERA_MT9M001 + [2.6.22] #This driver requires I2C probe/remove fields VIDEO_TCM825X # This driver requires list_first_entry -CONFIG_USB_STKWEBCAM +USB_STKWEBCAM [2.6.20] #This driver requires HID_REQ_GET_REPORT @@ -197,6 +203,7 @@ DVB_TDA18271 VIDEO_SAA7146 VIDEO_SAA7146_VV VIDEO_TUNER +VIDEO_TUNER_TYPES VIDEO_BTCX VIDEO_IR VIDEO_TVEEPROM |