Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6-omap-h63xx.git] / Documentation / DocBook / usb.tmpl

diff --git a/Documentation/DocBook/usb.tmpl b/Documentation/DocBook/usb.tmpl
index f3ef0bf435e9ebde6ba5174f43ef7168059058fa..15ce0f21e5e0c04c28e095941a21606192d8404b 100644 (file)
--- a/Documentation/DocBook/usb.tmpl
+++ b/Documentation/DocBook/usb.tmpl
@@ -291,7 +291,7 @@
 
 !Edrivers/usb/core/hcd.c
 !Edrivers/usb/core/hcd-pci.c
 
 !Edrivers/usb/core/hcd.c
 !Edrivers/usb/core/hcd-pci.c

-!Edrivers/usb/core/buffer.c
+!Idrivers/usb/core/buffer.c

     </chapter>
 
     <chapter>
     </chapter>
 
     <chapter>


@@ -841,7 +841,7 @@ usbdev_ioctl (int fd, int ifno, unsigned request, void *param)
                    File modification time is not updated by this request.
                    </para><para>
                    Those struct members are from some interface descriptor
                    File modification time is not updated by this request.
                    </para><para>
                    Those struct members are from some interface descriptor

-                   applying to the the current configuration.
+                   applying to the current configuration.

                    The interface number is the bInterfaceNumber value, and
                    the altsetting number is the bAlternateSetting value.
                    (This resets each endpoint in the interface.)
                    The interface number is the bInterfaceNumber value, and
                    the altsetting number is the bAlternateSetting value.
                    (This resets each endpoint in the interface.)