diff --git a/[refs] b/[refs] index 81c80b4af779..9ba61d480f41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c63d6ea3060d9e10773e869b1112e3a0efbcf820 +refs/heads/master: d751e623969bf758f3f75f59418b19ede570ab50 diff --git a/trunk/net/can/af_can.c b/trunk/net/can/af_can.c index 094fc5332d42..8ce926d3b2cb 100644 --- a/trunk/net/can/af_can.c +++ b/trunk/net/can/af_can.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -161,8 +162,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol, * return the error code immediately. Below we will * return -EPROTONOSUPPORT */ - if (err && printk_ratelimit()) - printk(KERN_ERR "can: request_module " + if (err) + printk_ratelimited(KERN_ERR "can: request_module " "(can-proto-%d) failed.\n", protocol); cp = can_get_proto(protocol);