diff options
Diffstat (limited to 'linux/drivers/media/video/wm8775.c')
| -rw-r--r-- | linux/drivers/media/video/wm8775.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/linux/drivers/media/video/wm8775.c b/linux/drivers/media/video/wm8775.c index 3813c01e0..4e60142ed 100644 --- a/linux/drivers/media/video/wm8775.c +++ b/linux/drivers/media/video/wm8775.c @@ -28,9 +28,9 @@ #include <linux/ioctl.h> #include <asm/uaccess.h> #include <linux/i2c.h> +#include <linux/i2c-id.h> #include <linux/videodev.h> #include <media/audiochip.h> -#include <media/id.h> MODULE_DESCRIPTION("wm8775 driver"); MODULE_AUTHOR("Ulf Eklund"); @@ -217,18 +217,10 @@ static int wm8775_probe(struct i2c_adapter *adapter) { #ifdef I2C_CLASS_TV_ANALOG if (adapter->class & I2C_CLASS_TV_ANALOG) - return i2c_probe(adapter, &addr_data, wm8775_attach); -#else - switch (adapter->id) { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) - case I2C_HW_B_BT848: #else - case I2C_ALGO_BIT | I2C_HW_B_BT848: + if (adapter->id == I2C_HW_B_BT848) #endif - return i2c_probe(adapter, &addr_data, tda9887_attach); - } -#endif /* I2C_CLASS_TV_ANALOG */ - + return i2c_probe(adapter, &addr_data, wm8775_attach); return 0; } |