Commit:     3f51bed3b7b691d873a84e0ba24aadd862bf6033
Parent:     e54e54a94cde0c2409974a4222ef2eda2e5609c8
Author:     Rob Landley <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 23:31:31 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 08:43:07 2007 -0700

    Fix "make htmldocs" build break.
    Fix two htmldocs build breaks, introduced by moving 
include/linux/usb_gadget.h to
    include/linux/usb/gadget.h and combining resume.c and suspend.c into main.c 
    Signed-off-by: Rob Landley <[EMAIL PROTECTED]>
    Cc: "Randy.Dunlap" <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 Documentation/DocBook/gadget.tmpl     |    6 +++---
 Documentation/DocBook/kernel-api.tmpl |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Documentation/DocBook/gadget.tmpl 
index 6996d97..5a8ffa7 100644
--- a/Documentation/DocBook/gadget.tmpl
+++ b/Documentation/DocBook/gadget.tmpl
@@ -144,7 +144,7 @@ with the lowest level (which directly handles hardware).
        <para>This is the lowest software level.
        It is the only layer that talks to hardware,
        through registers, fifos, dma, irqs, and the like.
-       The <filename>&lt;linux/usb_gadget.h&gt;</filename> API abstracts
+       The <filename>&lt;linux/usb/gadget.h&gt;</filename> API abstracts
        the peripheral controller endpoint hardware.
        That hardware is exposed through endpoint objects, which accept
        streams of IN/OUT buffers, and through callbacks that interact
@@ -494,7 +494,7 @@ side drivers (and usbcore).
 <sect1 id="core"><title>Core Objects and Methods</title>
 <para>These are declared in
 and are used by gadget drivers to interact with
 USB peripheral controller drivers.
@@ -509,7 +509,7 @@ USB peripheral controller drivers.
             unless the explanations are trivial.
 <sect1 id="utils"><title>Optional Utilities</title>
diff --git a/Documentation/DocBook/kernel-api.tmpl 
index 230cbf7..083258f 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -386,8 +386,7 @@ X!Edrivers/base/interface.c
      <sect1><title>Device Drivers Power Management</title>
      <sect1><title>Device Drivers ACPI Support</title>
 <!-- Internal functions only
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to