diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-30 11:03:09 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 13:36:56 +0200 |
| commit | 187565c43a95bcf7798c58d518ddd765933d24da (patch) | |
| tree | 1e7efe1701a1722df3899b5180c9cbe3c32a2627 /drivers/media/video/bt856.c | |
| parent | V4L/DVB (8847): uvcvideo: Add support for a Bison Electronics webcam found in... (diff) | |
| download | linux-187565c43a95bcf7798c58d518ddd765933d24da.tar.xz linux-187565c43a95bcf7798c58d518ddd765933d24da.zip | |
V4L/DVB (8850): bt856: fix define conflict
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/bt856.c')
| -rw-r--r-- | drivers/media/video/bt856.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c index 98ee2d8feb34..ab2ce4d7b5de 100644 --- a/drivers/media/video/bt856.c +++ b/drivers/media/video/bt856.c @@ -68,8 +68,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]; @@ -89,7 +89,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); } @@ -103,7 +103,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)); } |