diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-30 11:03:09 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-30 11:03:09 +0200 |
| commit | 67e93560aecd64287dd726434d034631f33fa158 (patch) | |
| tree | a67c22c326ae7443612ffaffdc4d9e9e7656ca5f /linux/drivers/media/video/bt856.c | |
| parent | 02b7d50e14bfab34a05bb914d44cf219742e7e1f (diff) | |
| download | mediapointer-dvb-s2-67e93560aecd64287dd726434d034631f33fa158.tar.gz mediapointer-dvb-s2-67e93560aecd64287dd726434d034631f33fa158.tar.bz2 | |
bt856: fix define conflict
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/bt856.c')
| -rw-r--r-- | linux/drivers/media/video/bt856.c | 8 |
1 files changed, 4 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)); } |