summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa6588.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/saa6588.c')
-rw-r--r--linux/drivers/media/video/saa6588.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa6588.c b/linux/drivers/media/video/saa6588.c
index 818fd1f22..0ccfa5da0 100644
--- a/linux/drivers/media/video/saa6588.c
+++ b/linux/drivers/media/video/saa6588.c
@@ -33,6 +33,9 @@
#include <asm/uaccess.h>
#include <media/id.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#endif
#include "rds.h"
@@ -440,7 +443,9 @@ static int saa6588_probe(struct i2c_adapter *adap)
switch (adap->id) {
case I2C_HW_B_BT848:
case I2C_HW_B_RIVA:
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
case I2C_HW_SAA7134:
+#endif
return i2c_probe(adap, &addr_data, saa6588_attach);
break;
}
@@ -501,7 +506,9 @@ static int saa6588_command(struct i2c_client *client, unsigned int cmd,
/* ----------------------------------------------------------------------- */
static struct i2c_driver driver = {
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,54)
.owner = THIS_MODULE,
+#endif
.name = "i2c saa6588 driver",
.id = -1, /* FIXME */
.flags = I2C_DF_NOTIFY,