Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / include / media / msp3400.h

diff --git a/include/media/msp3400.h b/include/media/msp3400.h
index 6ab854931c0596c9848a71340f359c058c0a2f03..90cf22ada8b4a4a0d2f33b13968883ad365290c6 100644 (file)
--- a/include/media/msp3400.h
+++ b/include/media/msp3400.h
@@ -54,13 +54,13 @@
    =======
 
    So to specify a complete routing scheme for the msp3400 you will have to
    =======
 
    So to specify a complete routing scheme for the msp3400 you will have to

-   specify in the 'input' field of the v4l2_routing struct:
+   specify in the 'input' arg of the s_routing function:

 
    1) which tuner input to use
    2) which SCART input to use
    3) which DSP input to use for each DSP output
 
 
    1) which tuner input to use
    2) which SCART input to use
    3) which DSP input to use for each DSP output
 

-   And in the 'output' field of the v4l2_routing struct you specify:
+   And in the 'output' arg of the s_routing function you specify:

 
    1) which SCART input to use for each SCART output
 
 
    1) which SCART input to use for each SCART output