3 files changed, 12 insertions, 23 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-audio.c b/linux/drivers/media/video/cx25840/cx25840-audio.c
index eda48b596..8e134312c 100644
--- a/linux/drivers/media/video/cx25840/cx25840-audio.c
+++ b/linux/drivers/media/video/cx25840/cx25840-audio.c
@@ -21,9 +21,6 @@
 #include <media/v4l2-common.h>
 #include <media/cx25840.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
 
 #include "cx25840-core.h"
 
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c
index e4a25d7cc..a43ed390a 100644
--- a/linux/drivers/media/video/cx25840/cx25840-core.c
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c
@@ -42,9 +42,6 @@
 #include <media/v4l2-i2c-drv-legacy.h>
 #include <media/cx25840.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
 
 #include "cx25840-core.h"
 
@@ -54,17 +51,9 @@ MODULE_LICENSE("GPL");
 
 static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
-#endif
-
 int cx25840_debug;
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
 module_param_named(debug,cx25840_debug, int, 0644);
-#else
-MODULE_PARM(cx25840_debug, "i");
-#endif
 
 MODULE_PARM_DESC(debug, "Debugging messages [0=Off (default) 1=On]");
 
@@ -462,7 +451,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
 		int chroma = vid_input & 0xf00;
 
 		if ((vid_input & ~0xff0) ||
-		    luma < CX25840_SVIDEO_LUMA1 || luma > CX25840_SVIDEO_LUMA4 ||
+		    luma < CX25840_SVIDEO_LUMA1 || luma > CX25840_SVIDEO_LUMA8 ||
 		    chroma < CX25840_SVIDEO_CHROMA4 || chroma > CX25840_SVIDEO_CHROMA8) {
 			v4l_err(client, "0x%04x is not a valid video input!\n",
 				vid_input);
@@ -1313,10 +1302,21 @@ static int cx25840_remove(struct i2c_client *client)
 	return 0;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
+static const struct i2c_device_id cx25840_id[] = {
+	{ "cx25840", 0 },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, cx25840_id);
+
+#endif
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
 	.name = "cx25840",
 	.driverid = I2C_DRIVERID_CX25840,
 	.command = cx25840_command,
 	.probe = cx25840_probe,
 	.remove = cx25840_remove,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
+	.id_table = cx25840_id,
+#endif
 };
diff --git a/linux/drivers/media/video/cx25840/cx25840-firmware.c b/linux/drivers/media/video/cx25840/cx25840-firmware.c
index d283ef2d1..95b84ce21 100644
--- a/linux/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/linux/drivers/media/video/cx25840/cx25840-firmware.c
@@ -38,19 +38,11 @@
  */
 #define FWSEND 48
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
 #define FWDEV(x) &((x)->dev)
-#else
-#define FWDEV(x) (x)->name
-#endif
 
 static char *firmware = FWFILE;
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
 module_param(firmware, charp, 0444);
-#else
-MODULE_PARM(firmware, "s");
-#endif
 
 MODULE_PARM_DESC(firmware, "Firmware image [default: " FWFILE "]");