[commits] batman-adv; branch, master, updated. v2011.1.0-93-g7b1ce30

The following commit has been merged in the master branch: commit 7b1ce3020535e5c8fa9fd06a1ed4066462ef8d1e Author: Sven Eckelmann sven@narfation.org Date: Sat May 7 21:48:04 2011 +0200

batman-adv: Remove unused variable r in bat_printk

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/compat.c b/compat.c index 34b27a1..70de376 100644 --- a/compat.c +++ b/compat.c @@ -909,11 +909,10 @@ int bat_vscnprintf(char *buf, size_t size, const char *fmt, va_list args) asmlinkage int bat_printk(const char *fmt, ...) { va_list args; - int r; char buf[256];

va_start(args, fmt); - r = bat_vsnprintf(buf, sizeof(buf), fmt, args); + bat_vsnprintf(buf, sizeof(buf), fmt, args); va_end(args);

return printk("%s", buf);