From: Rob Landley <[EMAIL PROTECTED]>

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 in
drivers/base/power.

Signed-off-by: Rob Landley <[EMAIL PROTECTED]>
---

 Documentation/DocBook/gadget.tmpl     |    6 +++---
 Documentation/DocBook/kernel-api.tmpl |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff -r aa4dbd059380 Documentation/DocBook/gadget.tmpl
--- a/Documentation/DocBook/gadget.tmpl Sat Oct 13 18:16:49 2007 -0700
+++ b/Documentation/DocBook/gadget.tmpl Sat Oct 13 23:51:56 2007 -0500
@@ -144,7 +144,7 @@ with the lowest level (which directly ha
        <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
-<filename>&lt;linux/usb_gadget.h&gt;</filename>,
+<filename>&lt;linux/usb/gadget.h&gt;</filename>,
 and are used by gadget drivers to interact with
 USB peripheral controller drivers.
 </para>
@@ -509,7 +509,7 @@ USB peripheral controller drivers.
             unless the explanations are trivial.
          -->
 
-!Iinclude/linux/usb_gadget.h
+!Iinclude/linux/usb/gadget.h
 </sect1>
 
 <sect1 id="utils"><title>Optional Utilities</title>
diff -r aa4dbd059380 Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/DocBook/kernel-api.tmpl     Sat Oct 13 18:16:49 2007 -0700
+++ b/Documentation/DocBook/kernel-api.tmpl     Sat Oct 13 23:51:56 2007 -0500
@@ -386,8 +386,7 @@ X!Edrivers/base/interface.c
 !Edrivers/base/bus.c
      </sect1>
      <sect1><title>Device Drivers Power Management</title>
-!Edrivers/base/power/resume.c
-!Edrivers/base/power/suspend.c
+!Edrivers/base/power/main.c
      </sect1>
      <sect1><title>Device Drivers ACPI Support</title>
 <!-- Internal functions only

-- 
"One of my most productive days was throwing away 1000 lines of code."
  - Ken Thompson.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to