diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-31 09:10:50 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-31 09:10:50 -0200 |
commit | f1ff79eafc9d2ff01fbec2eaee2f81bcf9544f86 (patch) | |
tree | 44efbb99651f24cb3a75c29bc3c0c33ef25b1c3e /linux/drivers/media/video/ivtv/ivtv-i2c.c | |
parent | e77871b7c84f213b57e7f34d30e2d9e45f59d8b5 (diff) | |
parent | 67da9a2a1f4c26fb835d42f1ba1a2c9b7542bf54 (diff) | |
download | mediapointer-dvb-s2-f1ff79eafc9d2ff01fbec2eaee2f81bcf9544f86.tar.gz mediapointer-dvb-s2-f1ff79eafc9d2ff01fbec2eaee2f81bcf9544f86.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-i2c.c')
-rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-i2c.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-i2c.c b/linux/drivers/media/video/ivtv/ivtv-i2c.c index 02b520060..d78f2f7fd 100644 --- a/linux/drivers/media/video/ivtv/ivtv-i2c.c +++ b/linux/drivers/media/video/ivtv/ivtv-i2c.c @@ -80,6 +80,7 @@ #endif /* I2C_ADAP_CLASS_TV_ANALOG */ #define IVTV_CS53L32A_I2C_ADDR 0x11 +#define IVTV_M52790_I2C_ADDR 0x48 #define IVTV_CX25840_I2C_ADDR 0x44 #define IVTV_SAA7115_I2C_ADDR 0x21 #define IVTV_SAA7127_I2C_ADDR 0x44 @@ -110,6 +111,7 @@ static const u8 hw_driverids[] = { I2C_DRIVERID_SAA717X, I2C_DRIVERID_WM8739, I2C_DRIVERID_VP27SMPX, + I2C_DRIVERID_M52790, 0 /* IVTV_HW_GPIO dummy driver ID */ }; @@ -130,6 +132,7 @@ static const char * const hw_drivernames[] = { "saa717x", "wm8739", "vp27smpx", + "m52790", "gpio", }; |