Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3f51bed3b7b691d873a84e0ba24aadd862bf6033

Authored by Rob Landley
Committed by Linus Torvalds
1 parent e54e54a94c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 4 additions and 5 deletions Side-by-side Diff

Documentation/DocBook/gadget.tmpl
Diff comments   View file @ 3f51bed
... ... @@ -144,7 +144,7 @@
144 144 <para>This is the lowest software level.
145 145 It is the only layer that talks to hardware,
146 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 148 the peripheral controller endpoint hardware.
149 149 That hardware is exposed through endpoint objects, which accept
150 150 streams of IN/OUT buffers, and through callbacks that interact
... ... @@ -494,7 +494,7 @@
494 494 <sect1 id="core"><title>Core Objects and Methods</title>
495 495  
496 496 <para>These are declared in
497   -<filename>&lt;linux/usb_gadget.h&gt;</filename>,
  497 +<filename>&lt;linux/usb/gadget.h&gt;</filename>,
498 498 and are used by gadget drivers to interact with
499 499 USB peripheral controller drivers.
500 500 </para>
... ... @@ -509,7 +509,7 @@
509 509 unless the explanations are trivial.
510 510 -->
511 511  
512   -!Iinclude/linux/usb_gadget.h
  512 +!Iinclude/linux/usb/gadget.h
513 513 </sect1>
514 514  
515 515 <sect1 id="utils"><title>Optional Utilities</title>
Documentation/DocBook/kernel-api.tmpl
Diff comments   View file @ 3f51bed
... ... @@ -386,8 +386,7 @@
386 386 !Edrivers/base/bus.c
387 387 </sect1>
388 388 <sect1><title>Device Drivers Power Management</title>
389   -!Edrivers/base/power/resume.c
390   -!Edrivers/base/power/suspend.c
  389 +!Edrivers/base/power/main.c
391 390 </sect1>
392 391 <sect1><title>Device Drivers ACPI Support</title>
393 392 <!-- Internal functions only