diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:24:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:24:26 +1000 |
| commit | 5f3e40ca0f60bfd5941a0e0c1c3c3a235f474dfe (patch) | |
| tree | 6f6e4b0a93a8fa7731ccf5cc375c77f918a1e295 /net | |
| parent | 970407cf5133fc6559af7041974edbf6ed4e2cc0 (diff) | |
| parent | 1458ce166c1b333ecbaf8caa9f4f54eab3a522a7 (diff) | |
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mesh.h | 2 | ||||
| -rw-r--r-- | net/wanrouter/wanmain.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index ebd3f1d9d889..58e741128968 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h @@ -115,7 +115,7 @@ struct mesh_path { * @hash_rnd: random value used for hash computations * @entries: number of entries in the table * @free_node: function to free nodes of the table - * @copy_node: fuction to copy nodes of the table + * @copy_node: function to copy nodes of the table * @size_order: determines size of the table, there will be 2^size_order hash * buckets * @mean_chain_len: maximum average length for the hash buckets' list, if it is diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index 2bf23406637a..74944a2dd436 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c @@ -471,7 +471,7 @@ static int wanrouter_device_setup(struct wan_device *wandev, data = vmalloc(conf->data_size); if (!data) { printk(KERN_INFO - "%s: ERROR, Faild allocate kernel memory !\n", + "%s: ERROR, Failed allocate kernel memory !\n", wandev->name); kfree(conf); return -ENOBUFS; @@ -481,7 +481,7 @@ static int wanrouter_device_setup(struct wan_device *wandev, err = wandev->setup(wandev, conf); } else { printk(KERN_INFO - "%s: ERROR, Faild to copy from user data !\n", + "%s: ERROR, Failed to copy from user data !\n", wandev->name); err = -EFAULT; } |