V4L/DVB (8850): bt856: fix define conflict

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 98ee2d8feb34ecbcb5282112e1b49a0e7b5957f6..ab2ce4d7b5de0dc3d822dd9b97d23f1bd358d807 100644 (file)
--- 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));
 }