aboutsummaryrefslogtreecommitdiff
path: root/net/tipc/server.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-06 17:44:28 +0800
committerMark Brown <broonie@linaro.org>2014-03-06 17:44:28 +0800
commitd083f580e5b940834a93ab741cdf064f0324dc0f (patch)
treed034075e47d68179d2f8bf7220d26bef0ba740d3 /net/tipc/server.c
parent931f27c6e892fdfe98896055e0df7962e21969d9 (diff)
parent13ff50c85846338bb9820abd3933227b678dc086 (diff)
Merge tag 'parse-val' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-core
regmap: Add parse_val() API This is useful for generic code built on top of regmap dealing with blocks of data.
Diffstat (limited to 'net/tipc/server.c')
-rw-r--r--net/tipc/server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/server.c b/net/tipc/server.c
index fd3fa57a410..b635ca347a8 100644
--- a/net/tipc/server.c
+++ b/net/tipc/server.c
@@ -55,7 +55,7 @@
* @usr_data: user-specified field
* @rx_action: what to do when connection socket is active
* @outqueue: pointer to first outbound message in queue
- * @outqueue_lock: controll access to the outqueue
+ * @outqueue_lock: control access to the outqueue
* @outqueue: list of connection objects for its server
* @swork: send work item
*/