aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 19:35:11 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 19:35:11 -0400
commit708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch)
treefe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/DocBook
parentf3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff)
parenta847825970e741e20a09c659978baa34016b63bc (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits) Add missing maintainer countries in CREDITS Fix bytes <-> kilobytes typo in Kconfig for ramdisk fix a typo in Documentation/pi-futex.txt BUG_ON conversion for fs/xfs/ BUG_ON() conversion in fs/nfsd/ BUG_ON conversion for fs/reiserfs BUG_ON cleanups in arch/i386 BUG_ON cleanup in drivers/net/tokenring/ BUG_ON cleanup for drivers/md/ kerneldoc-typo in led-class.c debugfs: spelling fix rcutorture: Fix incorrect description of default for nreaders parameter parport: Remove space in function calls Michal Wronski: update contact info Spelling fix: "control" instead of "cotrol" reboot parameter in Documentation/kernel-parameters.txt Fix copy&waste bug in comment in scripts/kernel-doc remove duplicate "until" from kernel/workqueue.c ite_gpio fix tabbage fix file specification in comments ... Fixed trivial path conflicts due to removed files: arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r--Documentation/DocBook/libata.tmpl2
-rw-r--r--Documentation/DocBook/usb.tmpl5
-rw-r--r--Documentation/DocBook/writing_usb_driver.tmpl7
3 files changed, 4 insertions, 10 deletions
diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl
index 065e8dc23e3a..c684abf0d3b2 100644
--- a/Documentation/DocBook/libata.tmpl
+++ b/Documentation/DocBook/libata.tmpl
@@ -1400,7 +1400,7 @@ and other resources, etc.
1400 <listitem> 1400 <listitem>
1401 <para> 1401 <para>
1402 When it's known that HBA is in ready state but ATA/ATAPI 1402 When it's known that HBA is in ready state but ATA/ATAPI
1403 device in in unknown state, reset only device. 1403 device is in unknown state, reset only device.
1404 </para> 1404 </para>
1405 </listitem> 1405 </listitem>
1406 1406
diff --git a/Documentation/DocBook/usb.tmpl b/Documentation/DocBook/usb.tmpl
index 3608472d7b74..143e5ff7deb8 100644
--- a/Documentation/DocBook/usb.tmpl
+++ b/Documentation/DocBook/usb.tmpl
@@ -314,8 +314,7 @@
314 <emphasis>usbdevfs</emphasis> although it wasn't solving what 314 <emphasis>usbdevfs</emphasis> although it wasn't solving what
315 <emphasis>devfs</emphasis> was. 315 <emphasis>devfs</emphasis> was.
316 Every USB device will appear in usbfs, regardless of whether or 316 Every USB device will appear in usbfs, regardless of whether or
317 not it has a kernel driver; but only devices with kernel drivers 317 not it has a kernel driver.
318 show up in devfs.
319 </para> 318 </para>
320 319
321 <sect1> 320 <sect1>
@@ -741,7 +740,7 @@ usbdev_ioctl (int fd, int ifno, unsigned request, void *param)
741 <title>Synchronous I/O Support</title> 740 <title>Synchronous I/O Support</title>
742 741
743 <para>Synchronous requests involve the kernel blocking 742 <para>Synchronous requests involve the kernel blocking
744 until until the user mode request completes, either by 743 until the user mode request completes, either by
745 finishing successfully or by reporting an error. 744 finishing successfully or by reporting an error.
746 In most cases this is the simplest way to use usbfs, 745 In most cases this is the simplest way to use usbfs,
747 although as noted above it does prevent performing I/O 746 although as noted above it does prevent performing I/O
diff --git a/Documentation/DocBook/writing_usb_driver.tmpl b/Documentation/DocBook/writing_usb_driver.tmpl
index 008a341234d0..07cd34c1940b 100644
--- a/Documentation/DocBook/writing_usb_driver.tmpl
+++ b/Documentation/DocBook/writing_usb_driver.tmpl
@@ -224,13 +224,8 @@ static int skel_probe(struct usb_interface *interface,
224 Conversely, when the device is removed from the USB bus, the disconnect 224 Conversely, when the device is removed from the USB bus, the disconnect
225 function is called with the device pointer. The driver needs to clean any 225 function is called with the device pointer. The driver needs to clean any
226 private data that has been allocated at this time and to shut down any 226 private data that has been allocated at this time and to shut down any
227 pending urbs that are in the USB system. The driver also unregisters 227 pending urbs that are in the USB system.
228 itself from the devfs subsystem with the call:
229 </para> 228 </para>
230 <programlisting>
231/* remove our devfs node */
232devfs_unregister(skel->devfs);
233 </programlisting>
234 <para> 229 <para>
235 Now that the device is plugged into the system and the driver is bound to 230 Now that the device is plugged into the system and the driver is bound to
236 the device, any of the functions in the file_operations structure that 231 the device, any of the functions in the file_operations structure that