diff options
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/Makefile | 10 | ||||
-rw-r--r-- | Documentation/DocBook/kernel-api.tmpl | 32 | ||||
-rw-r--r-- | Documentation/DocBook/writing_usb_driver.tmpl | 3 |
3 files changed, 37 insertions, 8 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index db9499adbed4..36526a1e76d7 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile | |||
@@ -190,9 +190,13 @@ quiet_cmd_fig2png = FIG2PNG $@ | |||
190 | ### | 190 | ### |
191 | # Help targets as used by the top-level makefile | 191 | # Help targets as used by the top-level makefile |
192 | dochelp: | 192 | dochelp: |
193 | @echo ' Linux kernel internal documentation in different formats:' | 193 | @echo ' Linux kernel internal documentation in different formats:' |
194 | @echo ' xmldocs (XML DocBook), psdocs (Postscript), pdfdocs (PDF)' | 194 | @echo ' htmldocs - HTML' |
195 | @echo ' htmldocs (HTML), mandocs (man pages, use installmandocs to install)' | 195 | @echo ' installmandocs - install man pages generated by mandocs' |
196 | @echo ' mandocs - man pages' | ||
197 | @echo ' pdfdocs - PDF' | ||
198 | @echo ' psdocs - Postscript' | ||
199 | @echo ' xmldocs - XML DocBook' | ||
196 | 200 | ||
197 | ### | 201 | ### |
198 | # Temporary files left by various tools | 202 | # Temporary files left by various tools |
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl index a1af278f9901..3fa0c4b4541e 100644 --- a/Documentation/DocBook/kernel-api.tmpl +++ b/Documentation/DocBook/kernel-api.tmpl | |||
@@ -418,9 +418,35 @@ X!Edrivers/pnp/system.c | |||
418 | !Idrivers/parport/daisy.c | 418 | !Idrivers/parport/daisy.c |
419 | </chapter> | 419 | </chapter> |
420 | 420 | ||
421 | <chapter id="viddev"> | 421 | <chapter id="message_devices"> |
422 | <title>Video4Linux</title> | 422 | <title>Message-based devices</title> |
423 | !Edrivers/media/video/videodev.c | 423 | <sect1><title>Fusion message devices</title> |
424 | !Edrivers/message/fusion/mptbase.c | ||
425 | !Idrivers/message/fusion/mptbase.c | ||
426 | !Edrivers/message/fusion/mptscsih.c | ||
427 | !Idrivers/message/fusion/mptscsih.c | ||
428 | !Idrivers/message/fusion/mptctl.c | ||
429 | !Idrivers/message/fusion/mptspi.c | ||
430 | !Idrivers/message/fusion/mptfc.c | ||
431 | !Idrivers/message/fusion/mptlan.c | ||
432 | </sect1> | ||
433 | <sect1><title>I2O message devices</title> | ||
434 | !Iinclude/linux/i2o.h | ||
435 | !Idrivers/message/i2o/core.h | ||
436 | !Edrivers/message/i2o/iop.c | ||
437 | !Idrivers/message/i2o/iop.c | ||
438 | !Idrivers/message/i2o/config-osm.c | ||
439 | !Edrivers/message/i2o/exec-osm.c | ||
440 | !Idrivers/message/i2o/exec-osm.c | ||
441 | !Idrivers/message/i2o/bus-osm.c | ||
442 | !Edrivers/message/i2o/device.c | ||
443 | !Idrivers/message/i2o/device.c | ||
444 | !Idrivers/message/i2o/driver.c | ||
445 | !Idrivers/message/i2o/pci.c | ||
446 | !Idrivers/message/i2o/i2o_block.c | ||
447 | !Idrivers/message/i2o/i2o_scsi.c | ||
448 | !Idrivers/message/i2o/i2o_proc.c | ||
449 | </sect1> | ||
424 | </chapter> | 450 | </chapter> |
425 | 451 | ||
426 | <chapter id="snddev"> | 452 | <chapter id="snddev"> |
diff --git a/Documentation/DocBook/writing_usb_driver.tmpl b/Documentation/DocBook/writing_usb_driver.tmpl index 07cd34c1940b..d4188d4ff535 100644 --- a/Documentation/DocBook/writing_usb_driver.tmpl +++ b/Documentation/DocBook/writing_usb_driver.tmpl | |||
@@ -345,8 +345,7 @@ static inline void skel_delete (struct usb_skel *dev) | |||
345 | usb_buffer_free (dev->udev, dev->bulk_out_size, | 345 | usb_buffer_free (dev->udev, dev->bulk_out_size, |
346 | dev->bulk_out_buffer, | 346 | dev->bulk_out_buffer, |
347 | dev->write_urb->transfer_dma); | 347 | dev->write_urb->transfer_dma); |
348 | if (dev->write_urb != NULL) | 348 | usb_free_urb (dev->write_urb); |
349 | usb_free_urb (dev->write_urb); | ||
350 | kfree (dev); | 349 | kfree (dev); |
351 | } | 350 | } |
352 | </programlisting> | 351 | </programlisting> |