1 files changed, 16 insertions, 16 deletions
diff --git a/linux/drivers/media/video/cs53l32a.c b/linux/drivers/media/video/cs53l32a.c
index e98574f42..bef0950e5 100644
--- a/linux/drivers/media/video/cs53l32a.c
+++ b/linux/drivers/media/video/cs53l32a.c
@@ -30,10 +30,6 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-i2c-drv-legacy.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
-#include "i2c-compat.h"
-#include <linux/slab.h>
-#endif
 #include "compat.h"
 
 MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");
@@ -42,20 +38,12 @@ MODULE_LICENSE("GPL");
 
 static int debug;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 module_param(debug, bool, 0644);
-#else
-MODULE_PARM(debug, "i");
-#endif
 
 MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
 
 static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
-#endif
-
 I2C_CLIENT_INSMOD;
 
 /* ----------------------------------------------------------------------- */
@@ -156,7 +144,12 @@ static int cs53l32a_probe(struct i2c_client *client,
 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
 		return -EIO;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
 	snprintf(client->name, sizeof(client->name) - 1, "cs53l32a");
+#else
+	if (!id)
+		strlcpy(client->name, "cs53l32a", sizeof(client->name));
+#endif
 
 	v4l_info(client, "chip found @ 0x%x (%s)\n",
 			client->addr << 1, client->adapter->name);
@@ -187,13 +180,20 @@ static int cs53l32a_probe(struct i2c_client *client,
 	return 0;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
+static const struct i2c_device_id cs53l32a_id[] = {
+	{ "cs53l32a", 0 },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, cs53l32a_id);
+
+#endif
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
 	.name = "cs53l32a",
 	.driverid = I2C_DRIVERID_CS53L32A,
 	.command = cs53l32a_command,
 	.probe = cs53l32a_probe,
-};
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
-EXPORT_NO_SYMBOLS;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
+	.id_table = cs53l32a_id,
 #endif
+};