diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-22 08:52:13 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-22 08:52:13 -0200 |
| commit | 04bfa3fb23489d1d50722447feae5b63fc820106 (patch) | |
| tree | 5d9db0fd5d7e834eb71e26566f1e7774ff39f364 /linux/include | |
| parent | 860dcd16b80026ccae1d77354939f945bbf36bec (diff) | |
| parent | 02070de48e42d30eeb6dfa4ea2d3aeff1a0a980f (diff) | |
| download | mediapointer-dvb-s2-04bfa3fb23489d1d50722447feae5b63fc820106.tar.gz mediapointer-dvb-s2-04bfa3fb23489d1d50722447feae5b63fc820106.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-fixes
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 2 | ||||
| -rw-r--r-- | linux/include/media/i2c-addr.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 09cfcc43c..f64a3f780 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -1051,7 +1051,7 @@ enum v4l2_mpeg_video_bitrate_mode { #define V4L2_CID_MPEG_VIDEO_MUTE (V4L2_CID_MPEG_BASE+210) #define V4L2_CID_MPEG_VIDEO_MUTE_YUV (V4L2_CID_MPEG_BASE+211) -/* MPEG-class control IDs specific to the CX2584x driver as defined by V4L2 */ +/* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */ #define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) #define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+0) enum v4l2_mpeg_cx2341x_video_spatial_filter_mode { diff --git a/linux/include/media/i2c-addr.h b/linux/include/media/i2c-addr.h index e7ff44a35..5d0f56054 100644 --- a/linux/include/media/i2c-addr.h +++ b/linux/include/media/i2c-addr.h @@ -12,8 +12,6 @@ /* bttv address list */ #define I2C_ADDR_TSA5522 0xc2 #define I2C_ADDR_TDA7432 0x8a -#define I2C_ADDR_BT832_ALT1 0x88 -#define I2C_ADDR_BT832_ALT2 0x8a // alternate setting #define I2C_ADDR_TDA8425 0x82 #define I2C_ADDR_TDA9840 0x84 #define I2C_ADDR_TDA9850 0xb6 /* also used by 9855,9873 */ |