3 files changed, 11 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/linux/drivers/media/video/gspca/m5602/m5602_mt9m111.c
index ea2250217..566d4925a 100644
--- a/linux/drivers/media/video/gspca/m5602/m5602_mt9m111.c
+++ b/linux/drivers/media/video/gspca/m5602/m5602_mt9m111.c
@@ -69,7 +69,7 @@ sensor_found:
 
 int mt9m111_init(struct sd *sd)
 {
-	int i, err;
+	int i, err = 0;
 
 	/* Init the sensor */
 	for (i = 0; i < ARRAY_SIZE(init_mt9m111); i++) {
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_ov9650.h b/linux/drivers/media/video/gspca/m5602/m5602_ov9650.h
index 70429b411..f5830a0f7 100644
--- a/linux/drivers/media/video/gspca/m5602/m5602_ov9650.h
+++ b/linux/drivers/media/video/gspca/m5602/m5602_ov9650.h
@@ -466,7 +466,11 @@ static const unsigned char power_down_ov9650[][3] =
 
 /* Vertically and horizontally flips the image if matched, needed for machines
    where the sensor is mounted upside down */
-static const struct dmi_system_id ov9650_flip_dmi_table[] = {
+static
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    const
+#endif
+	struct dmi_system_id ov9650_flip_dmi_table[] = {
 	{
 		.ident = "ASUS A6VC",
 		.matches = {
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
index 5d808a750..a39183252 100644
--- a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
+++ b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
@@ -339,7 +339,11 @@ static const unsigned char init_s5k4aa[][4] =
 	{SENSOR, S5K4AA_GAIN_2, 0xa0, 0x00}
 };
 
-static const struct dmi_system_id s5k4aa_vflip_dmi_table[] = {
+static
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    const
+#endif
+	struct dmi_system_id s5k4aa_vflip_dmi_table[] = {
 	{
 		.ident = "Fujitsu-Siemens Amilo Xa 2528",
 		.matches = {