The patch number 8850 was added via Hans Verkuil <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Hans Verkuil <[EMAIL PROTECTED]>
bt856: fix define conflict
Priority: normal
Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
---
linux/drivers/media/video/bt856.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -r 29e758975b13 -r 6609f16a52de linux/drivers/media/video/bt856.c
--- a/linux/drivers/media/video/bt856.c Sat Aug 30 09:28:27 2008 +0200
+++ b/linux/drivers/media/video/bt856.c Sat Aug 30 11:03:09 2008 +0200
@@ -69,8 +69,8 @@ MODULE_PARM_DESC(debug, "Debug level (0-
/* ----------------------------------------------------------------------- */
-#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));
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/6609f16a52de2a4453a09f10d5a001ee52b22c89
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
