diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-10 15:27:29 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-10 15:27:29 -0300 |
| commit | 5d49071dc5848b7556ed9f536a7e671dedc8884e (patch) | |
| tree | 9da2b186965b434b4e4afdb446b2f6b58f4efddb | |
| parent | b4cd7d22b439cdc865623238af5cb16e877c67c5 (diff) | |
| download | mediapointer-dvb-s2-5d49071dc5848b7556ed9f536a7e671dedc8884e.tar.gz mediapointer-dvb-s2-5d49071dc5848b7556ed9f536a7e671dedc8884e.tar.bz2 | |
Fix compilation with kernel 2.6.25
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/mt9m001.c | 4 | ||||
| -rw-r--r-- | v4l/compat.h | 4 |
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) |