diff options
author | Michal Marek <mmarek@suse.cz> | 2010-10-27 22:15:57 (GMT) |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 22:15:57 (GMT) |
commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /Documentation/connector | |
parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
download | linux-fsl-qoriq-b74b953b998bcc2db91b694446f3a2619ec32de6.tar.xz |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'Documentation/connector')
-rw-r--r-- | Documentation/connector/cn_test.c | 1 | ||||
-rw-r--r-- | Documentation/connector/connector.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/connector/cn_test.c b/Documentation/connector/cn_test.c index b07add3..7764594 100644 --- a/Documentation/connector/cn_test.c +++ b/Documentation/connector/cn_test.c @@ -25,6 +25,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/skbuff.h> +#include <linux/slab.h> #include <linux/timer.h> #include <linux/connector.h> diff --git a/Documentation/connector/connector.txt b/Documentation/connector/connector.txt index 78c9466..e5c5f5e 100644 --- a/Documentation/connector/connector.txt +++ b/Documentation/connector/connector.txt @@ -88,7 +88,7 @@ int cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask); int gfp_mask - GFP mask. Note: When registering new callback user, connector core assigns - netlink group to the user which is equal to it's id.idx. + netlink group to the user which is equal to its id.idx. /*****************************************/ Protocol description. |