diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-19 16:35:57 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-24 20:26:57 +0100 |
| commit | 2474ed444b475614ef795523076be7cc8437ae00 (patch) | |
| tree | 87808b3c7ff145b63a638e6e42ffce9db7db1b8c /drivers/media/video/msp3400-driver.h | |
| parent | V4L/DVB (3581): Add new media/msp3400.h header containing the routing macros (diff) | |
| download | linux-2474ed444b475614ef795523076be7cc8437ae00.tar.xz linux-2474ed444b475614ef795523076be7cc8437ae00.zip | |
V4L/DVB (3582): Implement correct msp3400 input/output routing
- implement VIDIOC_INT_S_AUDIO_ROUTING for msp3400 and tvaudio
- use the new command in bttv, pvrusb2 and em28xx.
- remove the now obsolete MSP_SET_MATRIX from msp3400 (yeah!)
- remove the obsolete VIDIOC_S_AUDIO from msp3400.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/msp3400-driver.h')
| -rw-r--r-- | drivers/media/video/msp3400-driver.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400-driver.h index 04821ebfe04a..1940748bb633 100644 --- a/drivers/media/video/msp3400-driver.h +++ b/drivers/media/video/msp3400-driver.h @@ -4,6 +4,8 @@ #ifndef MSP3400_DRIVER_H #define MSP3400_DRIVER_H +#include <media/msp3400.h> + /* ---------------------------------------------------------------------- */ /* This macro is allowed for *constants* only, gcc must calculate it @@ -72,7 +74,7 @@ struct msp_state { int i2s_mode; int main, second; /* sound carrier */ int input; - int source; /* see msp34xxg_set_source */ + struct v4l2_routing routing; /* v4l2 */ int audmode; |