projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
drivers
/
media
/
video
/
msp3400-driver.h
diff --git
a/drivers/media/video/msp3400-driver.h
b/drivers/media/video/msp3400-driver.h
index
3fe1c1b
..
d6b3e6d
100644
(file)
--- a/
drivers/media/video/msp3400-driver.h
+++ b/
drivers/media/video/msp3400-driver.h
@@
-80,7
+80,8
@@
struct msp_state {
int i2s_mode;
int main, second; /* sound carrier */
int input;
- struct v4l2_routing routing;
+ u32 route_in;
+ u32 route_out;
/* v4l2 */
int audmode;