diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-30 07:06:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-30 07:06:39 -0300 |
| commit | 9bcda4998b34e63d38d390763cdbda7706f033d9 (patch) | |
| tree | 963ec6a411f4d3c6393a6477d89613290989c8aa /linux/drivers/media | |
| parent | d0c6f4ec6b9d0e37d63cfc2e25bd415f305a0be8 (diff) | |
| parent | 67e93560aecd64287dd726434d034631f33fa158 (diff) | |
| download | mediapointer-dvb-s2-9bcda4998b34e63d38d390763cdbda7706f033d9.tar.gz mediapointer-dvb-s2-9bcda4998b34e63d38d390763cdbda7706f033d9.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/bt856.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/cpia.c | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bt856.c b/linux/drivers/media/video/bt856.c index 50ca987ad..e31c9d4b9 100644 --- a/linux/drivers/media/video/bt856.c +++ b/linux/drivers/media/video/bt856.c @@ -69,8 +69,8 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); /* ----------------------------------------------------------------------- */ -#define REG_OFFSET 0xDA -#define BT856_NR_REG 6 +#define BT856_REG_OFFSET 0xDA +#define BT856_NR_REG 6 struct bt856 { unsigned char reg[BT856_NR_REG]; @@ -90,7 +90,7 @@ bt856_write (struct i2c_client *client, { struct bt856 *encoder = i2c_get_clientdata(client); - encoder->reg[reg - REG_OFFSET] = value; + encoder->reg[reg - BT856_REG_OFFSET] = value; return i2c_smbus_write_byte_data(client, reg, value); } @@ -104,7 +104,7 @@ bt856_setbit (struct i2c_client *client, return bt856_write(client, reg, (encoder-> - reg[reg - REG_OFFSET] & ~(1 << bit)) | + reg[reg - BT856_REG_OFFSET] & ~(1 << bit)) | (value ? (1 << bit) : 0)); } diff --git a/linux/drivers/media/video/cpia.c b/linux/drivers/media/video/cpia.c index 448dccfb1..0bee440ab 100644 --- a/linux/drivers/media/video/cpia.c +++ b/linux/drivers/media/video/cpia.c @@ -44,6 +44,7 @@ #endif #include "cpia.h" +#include "compat.h" static int video_nr = -1; |