diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-17 10:06:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-17 10:06:23 -0300 |
| commit | 47a1368908d1a5cd3548d44cfa19853c26ddfeaf (patch) | |
| tree | 3f6e533e608f3158b37980e1dbbafea627f3b47a /linux/drivers/media/video/cx18 | |
| parent | aeb3a788273d65fa47c79635a886bcafc7970807 (diff) | |
| parent | f8c7dcdb0142ecb0a9634945df8bd9b26522f5b7 (diff) | |
| download | mediapointer-dvb-s2-47a1368908d1a5cd3548d44cfa19853c26ddfeaf.tar.gz mediapointer-dvb-s2-47a1368908d1a5cd3548d44cfa19853c26ddfeaf.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-i2c.c b/linux/drivers/media/video/cx18/cx18-i2c.c index 779ac7cbf..b44220b68 100644 --- a/linux/drivers/media/video/cx18/cx18-i2c.c +++ b/linux/drivers/media/video/cx18/cx18-i2c.c @@ -119,7 +119,7 @@ static int cx18_i2c_new_ir(struct i2c_adapter *adap, u32 hw, const char *type, /* Our default information for ir-kbd-i2c.c to use */ switch (hw) { case CX18_HW_Z8F0811_IR_RX_HAUP: - info.platform_data = &z8f0811_ir_init_data; + info.platform_data = (void *) &z8f0811_ir_init_data; break; default: break; |