diff --git a/[refs] b/[refs] index f33c7755460b..608a17f543aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3a547be40008be590c169ff2d5d73cc7fada71d +refs/heads/master: f678bc9883bb28d9d20db01bc0de53efbacc21c5 diff --git a/trunk/net/batman-adv/bat_debugfs.c b/trunk/net/batman-adv/bat_debugfs.c index 4577d3fe9940..e8491ee66468 100644 --- a/trunk/net/batman-adv/bat_debugfs.c +++ b/trunk/net/batman-adv/bat_debugfs.c @@ -82,7 +82,7 @@ int debug_log(struct bat_priv *bat_priv, char *fmt, ...) va_start(args, fmt); vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args); - fdebug_log(bat_priv->debug_log, "[%10u] %s", + fdebug_log(bat_priv->debug_log, "[%10lu] %s", (jiffies / HZ), tmp_log_buf); va_end(args);