summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/mt9m001.c4
-rw-r--r--v4l/compat.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/linux/drivers/media/video/mt9m001.c b/linux/drivers/media/video/mt9m001.c
index ee4349954..089ce311f 100644
--- a/linux/drivers/media/video/mt9m001.c
+++ b/linux/drivers/media/video/mt9m001.c
@@ -694,11 +694,13 @@ static int mt9m001_remove(struct i2c_client *client)
return 0;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
static const struct i2c_device_id mt9m001_id[] = {
{ "mt9m001", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, mt9m001_id);
+#endif
static struct i2c_driver mt9m001_i2c_driver = {
.driver = {
@@ -706,7 +708,9 @@ static struct i2c_driver mt9m001_i2c_driver = {
},
.probe = mt9m001_probe,
.remove = mt9m001_remove,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
.id_table = mt9m001_id,
+#endif
};
static int __init mt9m001_mod_init(void)
diff --git a/v4l/compat.h b/v4l/compat.h
index c480af095..b49572b4e 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -557,7 +557,11 @@ static inline struct proc_dir_entry *proc_create(const char *a,
}
return e;
}
+#endif
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+#ifdef CONFIG_PROC_FS
static inline struct proc_dir_entry *proc_create_data(const char *a,
mode_t b, struct proc_dir_entry *c, const struct file_operations *d,
void *f)