Commit 3f51bed3 authored by Rob Landley's avatar Rob Landley Committed by Linus Torvalds
Browse files

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: default avatarRob Landley <rob@landley.net>
Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e54e54a9

Documentation/DocBook/gadget.tmpl

+3 −3
Original line number Diff line number Diff line
@@ -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

<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>

Documentation/DocBook/kernel-api.tmpl

+1 −2
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE