From b8550cb1ae42bf3f3e869aec3270301e9a71ce0e Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 14 Sep 2012 06:14:16 -0300
Subject: [PATCH] --- yaml --- r: 331091 b: refs/heads/master c:
 cd56c8dd50fab57520f0cf80cee5de552c1680ed h: refs/heads/master i:   331089:
 0074bf509cd90f874371d11d7eef90440a934e68   331087:
 dbe78d57e9cb722e6bac3f98435fc51a85e84a6b v: v3

---
 [refs]                                                 |  2 +-
 .../DocBook/media/v4l/vidioc-querycap.xml              | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fc2306c5acb3..962f2c157c48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93828d6438081649e81b8681df9bf6ad5d691650
+refs/heads/master: cd56c8dd50fab57520f0cf80cee5de552c1680ed
diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-querycap.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-querycap.xml
index f33dd746b66b..4c70215ae03f 100644
--- a/trunk/Documentation/DocBook/media/v4l/vidioc-querycap.xml
+++ b/trunk/Documentation/DocBook/media/v4l/vidioc-querycap.xml
@@ -90,11 +90,13 @@ ambiguities.</entry>
 	    <entry>__u8</entry>
 	    <entry><structfield>bus_info</structfield>[32]</entry>
 	    <entry>Location of the device in the system, a
-NUL-terminated ASCII string. For example: "PCI Slot 4". This
+NUL-terminated ASCII string. For example: "PCI:0000:05:06.0". This
 information is intended for users, to distinguish multiple
-identical devices. If no such information is available the field may
-simply count the devices controlled by the driver, or contain the
-empty string (<structfield>bus_info</structfield>[0] = 0).<!-- XXX pci_dev->slot_name example --></entry>
+identical devices. If no such information is available the field must
+simply count the devices controlled by the driver ("platform:vivi-000").
+The bus_info must start with "PCI:" for PCI boards, "PCIe:" for PCI Express boards,
+"usb-" for USB devices, "I2C:" for i2c devices, "ISA:" for ISA devices,
+"parport" for parallel port devices and "platform:" for platform devices.</entry>
 	  </row>
 	  <row>
 	    <entry>__u32</entry>