summaryrefslogtreecommitdiff
path: root/Documentation/DocBook/writing_usb_driver.tmpl
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-09-04 12:49:39 +0400
committerJiri Kosina <jkosina@suse.cz>2013-09-04 12:49:57 +0400
commitefd15f5f4ff63f6ac5d80850686e3d2cc8c4481b (patch)
tree40024adbe77a3d660662e639fd765097133d648c /Documentation/DocBook/writing_usb_driver.tmpl
parent6c2794a2984f4c17a58117a68703cc7640f01c5a (diff)
parent58c59bc997d86593f0bea41845885917cf304d22 (diff)
downloadlinux-efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b.tar.xz
Merge branch 'master' into for-3.12/upstream
Sync with Linus' tree to be able to apply fixup patch on top of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air") Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/DocBook/writing_usb_driver.tmpl')
-rw-r--r--Documentation/DocBook/writing_usb_driver.tmpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/writing_usb_driver.tmpl b/Documentation/DocBook/writing_usb_driver.tmpl
index bd97a13fa5ae..3210dcf741c9 100644
--- a/Documentation/DocBook/writing_usb_driver.tmpl
+++ b/Documentation/DocBook/writing_usb_driver.tmpl
@@ -83,7 +83,7 @@
</para>
<para>
Because each different protocol causes a new driver to be created, I have
- written a generic USB driver skeleton, modeled after the pci-skeleton.c
+ written a generic USB driver skeleton, modelled after the pci-skeleton.c
file in the kernel source tree upon which many PCI network drivers have
been based. This USB skeleton can be found at drivers/usb/usb-skeleton.c
in the kernel source tree. In this article I will walk through the basics