diff options
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r-- | drivers/media/video/cx18/cx18-driver.h | 2 | ||||
-rw-r--r-- | drivers/media/video/cx18/cx18-i2c.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h index b421e0268b00..b78d0e38d53d 100644 --- a/drivers/media/video/cx18/cx18-driver.h +++ b/drivers/media/video/cx18/cx18-driver.h | |||
@@ -230,9 +230,7 @@ struct cx18_dvb { | |||
230 | struct dvb_net dvbnet; | 230 | struct dvb_net dvbnet; |
231 | int enabled; | 231 | int enabled; |
232 | int feeding; | 232 | int feeding; |
233 | |||
234 | struct mutex feedlock; | 233 | struct mutex feedlock; |
235 | |||
236 | }; | 234 | }; |
237 | 235 | ||
238 | struct cx18; /* forward reference */ | 236 | struct cx18; /* forward reference */ |
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c index 3f972e2db705..6023ba3bd3a6 100644 --- a/drivers/media/video/cx18/cx18-i2c.c +++ b/drivers/media/video/cx18/cx18-i2c.c | |||
@@ -39,10 +39,6 @@ | |||
39 | #define GETSCL_BIT 0x0004 | 39 | #define GETSCL_BIT 0x0004 |
40 | #define GETSDL_BIT 0x0008 | 40 | #define GETSDL_BIT 0x0008 |
41 | 41 | ||
42 | #ifndef I2C_ADAP_CLASS_TV_ANALOG | ||
43 | #define I2C_ADAP_CLASS_TV_ANALOG I2C_CLASS_TV_ANALOG | ||
44 | #endif | ||
45 | |||
46 | #define CX18_CS5345_I2C_ADDR 0x4c | 42 | #define CX18_CS5345_I2C_ADDR 0x4c |
47 | 43 | ||
48 | /* This array should match the CX18_HW_ defines */ | 44 | /* This array should match the CX18_HW_ defines */ |