summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/msp3400-driver.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-03-19 16:35:57 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2006-03-19 16:35:57 +0100
commitfde3e3b6816368fa44ece4a962fd3ef5ed664398 (patch)
tree22004efc3fe8489597fae89142217965b630f2b9 /linux/drivers/media/video/msp3400-driver.h
parenta54e9c36217d11493c90e0dbdef2f48625525702 (diff)
downloadmediapointer-dvb-s2-fde3e3b6816368fa44ece4a962fd3ef5ed664398.tar.gz
mediapointer-dvb-s2-fde3e3b6816368fa44ece4a962fd3ef5ed664398.tar.bz2
Implement correct msp3400 input/output routing
From: Hans Verkuil <hverkuil@xs4all.nl> - 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>
Diffstat (limited to 'linux/drivers/media/video/msp3400-driver.h')
-rw-r--r--linux/drivers/media/video/msp3400-driver.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.h b/linux/drivers/media/video/msp3400-driver.h
index 033d896e6..1b03cc5a9 100644
--- a/linux/drivers/media/video/msp3400-driver.h
+++ b/linux/drivers/media/video/msp3400-driver.h
@@ -5,6 +5,8 @@
#ifndef MSP3400_DRIVER_H
#define MSP3400_DRIVER_H
+#include <media/msp3400.h>
+
/* ---------------------------------------------------------------------- */
/* This macro is allowed for *constants* only, gcc must calculate it
@@ -73,7 +75,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;