git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
media
/
video
/
bttv-i2c.c
diff --git
a/drivers/media/video/bttv-i2c.c
b/drivers/media/video/bttv-i2c.c
index
c5c38e1
..
c07a0d9
100644
(file)
--- a/
drivers/media/video/bttv-i2c.c
+++ b/
drivers/media/video/bttv-i2c.c
@@
-108,8
+108,8
@@
static struct i2c_adapter bttv_i2c_adap_sw_template = {
.inc_use = bttv_inc_use,
.dec_use = bttv_dec_use,
#endif
.inc_use = bttv_inc_use,
.dec_use = bttv_dec_use,
#endif
-#ifdef I2C_
ADAP_
CLASS_TV_ANALOG
- .class = I2C_
ADAP_
CLASS_TV_ANALOG,
+#ifdef I2C_CLASS_TV_ANALOG
+ .class = I2C_CLASS_TV_ANALOG,
#endif
I2C_DEVNAME("bt848"),
.id = I2C_HW_B_BT848,
#endif
I2C_DEVNAME("bt848"),
.id = I2C_HW_B_BT848,
@@
-291,8
+291,8
@@
static struct i2c_adapter bttv_i2c_adap_hw_template = {
.inc_use = bttv_inc_use,
.dec_use = bttv_dec_use,
#endif
.inc_use = bttv_inc_use,
.dec_use = bttv_dec_use,
#endif
-#ifdef I2C_
ADAP_
CLASS_TV_ANALOG
- .class = I2C_
ADAP_
CLASS_TV_ANALOG,
+#ifdef I2C_CLASS_TV_ANALOG
+ .class = I2C_CLASS_TV_ANALOG,
#endif
I2C_DEVNAME("bt878"),
.id = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
#endif
I2C_DEVNAME("bt878"),
.id = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,