diff options
Diffstat (limited to 'linux/drivers/media/video/tda9840.c')
| -rw-r--r-- | linux/drivers/media/video/tda9840.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/linux/drivers/media/video/tda9840.c b/linux/drivers/media/video/tda9840.c index f39e4f54c..9cc13ec8e 100644 --- a/linux/drivers/media/video/tda9840.c +++ b/linux/drivers/media/video/tda9840.c @@ -24,6 +24,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "compat.h" + #include <linux/module.h> #include <linux/ioctl.h> #include <linux/i2c.h> @@ -221,10 +223,18 @@ static int detach(struct i2c_client *client) } static struct i2c_driver driver = { +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) &&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)) .owner = THIS_MODULE, +#endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) .name = "tda9840", - .id = I2C_DRIVERID_TDA9840, .flags = I2C_DF_NOTIFY, +#else + .driver = { + .name = "tda9840", + }, +#endif + .id = I2C_DRIVERID_TDA9840, .attach_adapter = attach, .detach_client = detach, .command = command, |