diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:41:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:41:32 -0500 |
| commit | f54a6ec0fd85002d94d05b4bb679508eeb066683 (patch) | |
| tree | 0f24dd66cce563d2c5e7656c2489e5b96eef31f9 /include/media/i2c-addr.h | |
| parent | 5ed1836814d908f45cafde0e79cb85314ab9d41d (diff) | |
| parent | 134179823b3ca9c8b98e0631906459dbb022ff9b (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (583 commits)
V4L/DVB (10130): use USB API functions rather than constants
V4L/DVB (10129): dvb: remove deprecated use of RW_LOCK_UNLOCKED in frontends
V4L/DVB (10128): modify V4L documentation to be a valid XHTML
V4L/DVB (10127): stv06xx: Avoid having y unitialized
V4L/DVB (10125): em28xx: Don't do AC97 vendor detection for i2s audio devices
V4L/DVB (10124): em28xx: expand output formats available
V4L/DVB (10123): em28xx: fix reversed definitions of I2S audio modes
V4L/DVB (10122): em28xx: don't load em28xx-alsa for em2870 based devices
V4L/DVB (10121): em28xx: remove worthless Pinnacle PCTV HD Mini 80e device profile
V4L/DVB (10120): em28xx: remove redundant Pinnacle Dazzle DVC 100 profile
V4L/DVB (10119): em28xx: fix corrupted XCLK value
V4L/DVB (10118): zoran: fix warning for a variable not used
V4L/DVB (10116): af9013: Fix gcc false warnings
V4L/DVB (10111a): usbvideo.h: remove an useless blank line
V4L/DVB (10111): quickcam_messenger.c: fix a warning
V4L/DVB (10110): v4l2-ioctl: Fix warnings when using .unlocked_ioctl = __video_ioctl2
V4L/DVB (10109): anysee: Fix usage of an unitialized function
V4L/DVB (10104): uvcvideo: Add support for video output devices
V4L/DVB (10102): uvcvideo: Ignore interrupt endpoint for built-in iSight webcams.
V4L/DVB (10101): uvcvideo: Fix bulk URB processing when the header is erroneous
...
Diffstat (limited to 'include/media/i2c-addr.h')
| -rw-r--r-- | include/media/i2c-addr.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/media/i2c-addr.h b/include/media/i2c-addr.h index e7ff44a35ca0..5d0f56054d26 100644 --- a/include/media/i2c-addr.h +++ b/include/media/i2c-addr.h | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | /* bttv address list */ | 12 | /* bttv address list */ |
| 13 | #define I2C_ADDR_TSA5522 0xc2 | 13 | #define I2C_ADDR_TSA5522 0xc2 |
| 14 | #define I2C_ADDR_TDA7432 0x8a | 14 | #define I2C_ADDR_TDA7432 0x8a |
| 15 | #define I2C_ADDR_BT832_ALT1 0x88 | ||
| 16 | #define I2C_ADDR_BT832_ALT2 0x8a // alternate setting | ||
| 17 | #define I2C_ADDR_TDA8425 0x82 | 15 | #define I2C_ADDR_TDA8425 0x82 |
| 18 | #define I2C_ADDR_TDA9840 0x84 | 16 | #define I2C_ADDR_TDA9840 0x84 |
| 19 | #define I2C_ADDR_TDA9850 0xb6 /* also used by 9855,9873 */ | 17 | #define I2C_ADDR_TDA9850 0xb6 /* also used by 9855,9873 */ |