Merge branch 'linus' into core/urgent

Update with Linus tree so fixes for the same can be applied.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 7 insertions, 2 deletions

diff --git a/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml b/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml
index 4ecd966808de..921e18550d26 100644
--- a/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml
@@ -200,10 +200,10 @@ the values from <xref linkend="chip-ids" />.</entry>
         &cs-def;
         <tbody valign="top">
           <row>
-            <entry><constant>V4L2_CHIP_MATCH_HOST</constant></entry>
+            <entry><constant>V4L2_CHIP_MATCH_BRIDGE</constant></entry>
             <entry>0</entry>
             <entry>Match the nth chip on the card, zero for the
-            host chip. Does not match &i2c; chips.</entry>
+            bridge chip. Does not match sub-devices.</entry>
           </row>
           <row>
             <entry><constant>V4L2_CHIP_MATCH_I2C_DRIVER</constant></entry>
@@ -220,6 +220,11 @@ the values from <xref linkend="chip-ids" />.</entry>
             <entry>3</entry>
             <entry>Match the nth anciliary AC97 chip.</entry>
           </row>
+          <row>
+            <entry><constant>V4L2_CHIP_MATCH_SUBDEV</constant></entry>
+            <entry>4</entry>
+            <entry>Match the nth sub-device. Can't be used with this ioctl.</entry>
+          </row>
         </tbody>
       </tgroup>
     </table>