summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tea6420.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/tea6420.c')
-rw-r--r--linux/drivers/media/video/tea6420.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/linux/drivers/media/video/tea6420.c b/linux/drivers/media/video/tea6420.c
index dd8279ad5..d22eac01b 100644
--- a/linux/drivers/media/video/tea6420.c
+++ b/linux/drivers/media/video/tea6420.c
@@ -26,6 +26,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>
@@ -167,10 +169,18 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
}
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 = "tea6420",
- .id = I2C_DRIVERID_TEA6420,
.flags = I2C_DF_NOTIFY,
+#else
+ .driver = {
+ .name = "tea6420",
+ },
+#endif
+ .id = I2C_DRIVERID_TEA6420,
.attach_adapter = attach,
.detach_client = detach,
.command = command,