diff options
Diffstat (limited to 'drivers/media/video/ivtv')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.h | 1 | ||||
-rw-r--r-- | drivers/media/video/ivtv/ivtv-i2c.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 9d23b1efd36d..a08bb3331cfb 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h | |||
@@ -635,7 +635,6 @@ struct ivtv { | |||
635 | spinlock_t lock; /* lock access to this struct */ | 635 | spinlock_t lock; /* lock access to this struct */ |
636 | struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */ | 636 | struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */ |
637 | 637 | ||
638 | |||
639 | /* Streams */ | 638 | /* Streams */ |
640 | int stream_buf_size[IVTV_MAX_STREAMS]; /* stream buffer size */ | 639 | int stream_buf_size[IVTV_MAX_STREAMS]; /* stream buffer size */ |
641 | struct ivtv_stream streams[IVTV_MAX_STREAMS]; /* stream data */ | 640 | struct ivtv_stream streams[IVTV_MAX_STREAMS]; /* stream data */ |
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c index 32129f3ea836..a1b37ff8669c 100644 --- a/drivers/media/video/ivtv/ivtv-i2c.c +++ b/drivers/media/video/ivtv/ivtv-i2c.c | |||
@@ -75,10 +75,6 @@ | |||
75 | #define IVTV_REG_I2C_GETSCL_OFFSET 0x7008 | 75 | #define IVTV_REG_I2C_GETSCL_OFFSET 0x7008 |
76 | #define IVTV_REG_I2C_GETSDA_OFFSET 0x700c | 76 | #define IVTV_REG_I2C_GETSDA_OFFSET 0x700c |
77 | 77 | ||
78 | #ifndef I2C_ADAP_CLASS_TV_ANALOG | ||
79 | #define I2C_ADAP_CLASS_TV_ANALOG I2C_CLASS_TV_ANALOG | ||
80 | #endif /* I2C_ADAP_CLASS_TV_ANALOG */ | ||
81 | |||
82 | #define IVTV_CS53L32A_I2C_ADDR 0x11 | 78 | #define IVTV_CS53L32A_I2C_ADDR 0x11 |
83 | #define IVTV_M52790_I2C_ADDR 0x48 | 79 | #define IVTV_M52790_I2C_ADDR 0x48 |
84 | #define IVTV_CX25840_I2C_ADDR 0x44 | 80 | #define IVTV_CX25840_I2C_ADDR 0x44 |