From: Hans Verkuil Date: Sat, 30 Aug 2008 09:03:09 +0000 (-0300) Subject: V4L/DVB (8850): bt856: fix define conflict X-Git-Tag: v2.6.28-rc1~601^2~227 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=187565c43a95bcf7798c58d518ddd765933d24da;p=linux-2.6-omap-h63xx.git V4L/DVB (8850): bt856: fix define conflict Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c index 98ee2d8feb3..ab2ce4d7b5d 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)); }