projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[linux-drm-fsl-dcu.git]
/
net
/
bridge
/
br.c
diff --git
a/net/bridge/br.c
b/net/bridge/br.c
index e1241c76239a96fb3e4d027ba071b640c2904ceb..76357b547752327d2ff4a7ce310effc5f4142b79 100644
(file)
--- a/
net/bridge/br.c
+++ b/
net/bridge/br.c
@@
-38,7
+38,7
@@
static int __init br_init(void)
err = stp_proto_register(&br_stp_proto);
if (err < 0) {
- pr
intk(KERN_ERR
"bridge: can't register sap for STP\n");
+ pr
_err(
"bridge: can't register sap for STP\n");
return err;
}