aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2007-10-17 02:31:31 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:43:07 -0400
commit3f51bed3b7b691d873a84e0ba24aadd862bf6033 (patch)
tree5049bca7506fe6214c503308cc50081b268862ce
parente54e54a94cde0c2409974a4222ef2eda2e5609c8 (diff)
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 in drivers/base/power. Signed-off-by: Rob Landley <rob@landley.net> Cc: "Randy.Dunlap" <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/DocBook/gadget.tmpl6
-rw-r--r--Documentation/DocBook/kernel-api.tmpl3
2 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/DocBook/gadget.tmpl b/Documentation/DocBook/gadget.tmpl
index 6996d977bf8f..5a8ffa761e09 100644
--- a/Documentation/DocBook/gadget.tmpl
+++ b/Documentation/DocBook/gadget.tmpl
@@ -144,7 +144,7 @@ with the lowest level (which directly handles hardware).
144 <para>This is the lowest software level. 144 <para>This is the lowest software level.
145 It is the only layer that talks to hardware, 145 It is the only layer that talks to hardware,
146 through registers, fifos, dma, irqs, and the like. 146 through registers, fifos, dma, irqs, and the like.
147 The <filename>&lt;linux/usb_gadget.h&gt;</filename> API abstracts 147 The <filename>&lt;linux/usb/gadget.h&gt;</filename> API abstracts
148 the peripheral controller endpoint hardware. 148 the peripheral controller endpoint hardware.
149 That hardware is exposed through endpoint objects, which accept 149 That hardware is exposed through endpoint objects, which accept
150 streams of IN/OUT buffers, and through callbacks that interact 150 streams of IN/OUT buffers, and through callbacks that interact
@@ -494,7 +494,7 @@ side drivers (and usbcore).
494<sect1 id="core"><title>Core Objects and Methods</title> 494<sect1 id="core"><title>Core Objects and Methods</title>
495 495
496<para>These are declared in 496<para>These are declared in
497<filename>&lt;linux/usb_gadget.h&gt;</filename>, 497<filename>&lt;linux/usb/gadget.h&gt;</filename>,
498and are used by gadget drivers to interact with 498and are used by gadget drivers to interact with
499USB peripheral controller drivers. 499USB peripheral controller drivers.
500</para> 500</para>
@@ -509,7 +509,7 @@ USB peripheral controller drivers.
509 unless the explanations are trivial. 509 unless the explanations are trivial.
510 --> 510 -->
511 511
512!Iinclude/linux/usb_gadget.h 512!Iinclude/linux/usb/gadget.h
513</sect1> 513</sect1>
514 514
515<sect1 id="utils"><title>Optional Utilities</title> 515<sect1 id="utils"><title>Optional Utilities</title>
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 230cbf753782..083258f0eab5 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -386,8 +386,7 @@ X!Edrivers/base/interface.c
386!Edrivers/base/bus.c 386!Edrivers/base/bus.c
387 </sect1> 387 </sect1>
388 <sect1><title>Device Drivers Power Management</title> 388 <sect1><title>Device Drivers Power Management</title>
389!Edrivers/base/power/resume.c 389!Edrivers/base/power/main.c
390!Edrivers/base/power/suspend.c
391 </sect1> 390 </sect1>
392 <sect1><title>Device Drivers ACPI Support</title> 391 <sect1><title>Device Drivers ACPI Support</title>
393<!-- Internal functions only 392<!-- Internal functions only