4 files changed, 13 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/frontends/au8522_decoder.c b/linux/drivers/media/dvb/frontends/au8522_decoder.c
index 7c782b8d5..70af9cda7 100644
--- a/linux/drivers/media/dvb/frontends/au8522_decoder.c
+++ b/linux/drivers/media/dvb/frontends/au8522_decoder.c
@@ -48,15 +48,17 @@ MODULE_LICENSE("GPL");
 
 static int au8522_analog_debug;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
 static unsigned short normal_i2c[] = { 0x8e >> 1, I2C_CLIENT_END };
 
+I2C_CLIENT_INSMOD;
+#endif
+
 module_param_named(analog_debug, au8522_analog_debug, int, 0644);
 
 MODULE_PARM_DESC(analog_debug,
 		 "Analog debugging messages [0=Off (default) 1=On]");
 
-I2C_CLIENT_INSMOD;
-
 struct au8522_register_config {
 	u16 reg_name;
 	u8 reg_val[8];
diff --git a/linux/drivers/media/video/au0828/au0828-video.c b/linux/drivers/media/video/au0828/au0828-video.c
index cd75b5dbf..ac5662c59 100644
--- a/linux/drivers/media/video/au0828/au0828-video.c
+++ b/linux/drivers/media/video/au0828/au0828-video.c
@@ -33,6 +33,7 @@
 #include <linux/device.h>
 #include <linux/suspend.h>
 #include <linux/version.h>
+#include <linux/mm.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-chip-ident.h>
diff --git a/linux/drivers/media/video/mt9v022.c b/linux/drivers/media/video/mt9v022.c
index bec6859b3..3bee30caa 100644
--- a/linux/drivers/media/video/mt9v022.c
+++ b/linux/drivers/media/video/mt9v022.c
@@ -741,8 +741,12 @@ static void mt9v022_video_remove(struct soc_camera_device *icd)
 	soc_camera_video_stop(icd);
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
 static int mt9v022_probe(struct i2c_client *client,
 			 const struct i2c_device_id *did)
+#else
+static int mt9v022_probe(struct i2c_client *client)
+#endif
 {
 	struct mt9v022 *mt9v022;
 	struct soc_camera_device *icd;
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c
index 3c42316c3..b153575fb 100644
--- a/linux/drivers/media/video/v4l2-common.c
+++ b/linux/drivers/media/video/v4l2-common.c
@@ -829,10 +829,10 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
 #endif
 
 	BUG_ON(!dev);
-#ifdef MODULE
+
 	if (module_name)
 		request_module(module_name);
-#endif
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
 	/* Setup the i2c board info with the device type and
 	   the device address. */
@@ -897,10 +897,10 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
 #endif
 
 	BUG_ON(!dev);
-#ifdef MODULE
+
 	if (module_name)
 		request_module(module_name);
-#endif
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
 	/* Setup the i2c board info with the device type and
 	   the device address. */