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/wanrouter/wanmain.c | |
| parent | 970407cf5133fc6559af7041974edbf6ed4e2cc0 (diff) | |
| parent | 1458ce166c1b333ecbaf8caa9f4f54eab3a522a7 (diff) | |
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'net/wanrouter/wanmain.c')
| -rw-r--r-- | net/wanrouter/wanmain.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |