aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 16:33:14 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 16:33:14 -0400
commitda206c9e68cb93fcab43592d46276c02889c1250 (patch)
tree21264cc26fa0322d668b398808f10bd93558d25f /drivers/ieee1394
parent916d15445f4ad2a9018e5451760734f36083be77 (diff)
parent2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: typo fixes Clean up 'inline is not at beginning' warnings for usb storage Storage class should be first i386: Trivial typo fixes ixj: make ixj_set_tone_off() static spelling fixes fix paniced->panicked typos Spelling fixes for Documentation/atomic_ops.txt move acknowledgment for Mark Adler to CREDITS remove the bouncing email address of David Campbell
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r--drivers/ieee1394/hosts.c2
-rw-r--r--drivers/ieee1394/ieee1394_core.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index 2d47b11777a5..ad49c040b674 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -103,7 +103,7 @@ static int alloc_hostnum_cb(struct hpsb_host *host, void *__data)
103 * driver specific parts, enable the controller and make it available 103 * driver specific parts, enable the controller and make it available
104 * to the general subsystem using hpsb_add_host(). 104 * to the general subsystem using hpsb_add_host().
105 * 105 *
106 * Return Value: a pointer to the &hpsb_host if succesful, %NULL if 106 * Return Value: a pointer to the &hpsb_host if successful, %NULL if
107 * no memory was available. 107 * no memory was available.
108 */ 108 */
109static DEFINE_MUTEX(host_num_alloc); 109static DEFINE_MUTEX(host_num_alloc);
diff --git a/drivers/ieee1394/ieee1394_core.h b/drivers/ieee1394/ieee1394_core.h
index e7b55e895f50..0ecbf335c64f 100644
--- a/drivers/ieee1394/ieee1394_core.h
+++ b/drivers/ieee1394/ieee1394_core.h
@@ -139,7 +139,7 @@ int hpsb_bus_reset(struct hpsb_host *host);
139 139
140/* 140/*
141 * Hand over received selfid packet to the core. Complement check (second 141 * Hand over received selfid packet to the core. Complement check (second
142 * quadlet is complement of first) is expected to be done and succesful. 142 * quadlet is complement of first) is expected to be done and successful.
143 */ 143 */
144void hpsb_selfid_received(struct hpsb_host *host, quadlet_t sid); 144void hpsb_selfid_received(struct hpsb_host *host, quadlet_t sid);
145 145