aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/main.c
diff options
context:
space:
mode:
authorcodeworkx <daniel.hillenbrand@codeworkx.de>2012-06-02 13:09:29 +0200
committercodeworkx <daniel.hillenbrand@codeworkx.de>2012-06-02 13:09:29 +0200
commitc6da2cfeb05178a11c6d062a06f8078150ee492f (patch)
treef3b4021d252c52d6463a9b3c1bb7245e399b009c /drivers/net/wireless/ath/main.c
parentc6d7c4dbff353eac7919342ae6b3299a378160a6 (diff)
downloadkernel_samsung_smdk4412-c6da2cfeb05178a11c6d062a06f8078150ee492f.zip
kernel_samsung_smdk4412-c6da2cfeb05178a11c6d062a06f8078150ee492f.tar.gz
kernel_samsung_smdk4412-c6da2cfeb05178a11c6d062a06f8078150ee492f.tar.bz2
samsung update 1
Diffstat (limited to 'drivers/net/wireless/ath/main.c')
-rw-r--r--drivers/net/wireless/ath/main.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c
index c325202..947ef45 100644
--- a/drivers/net/wireless/ath/main.c
+++ b/drivers/net/wireless/ath/main.c
@@ -57,22 +57,25 @@ struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,
}
EXPORT_SYMBOL(ath_rxbuf_alloc);
-int ath_printk(const char *level, struct ath_common *common,
- const char *fmt, ...)
+void ath_printk(const char *level, const char *fmt, ...)
{
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
struct va_format vaf;
+#endif
va_list args;
- int rtn;
va_start(args, fmt);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
vaf.fmt = fmt;
vaf.va = &args;
- rtn = printk("%sath: %pV", level, &vaf);
+ printk("%sath: %pV", level, &vaf);
+#else
+ printk("%sath: ", level);
+ vprintk(fmt, args);
+#endif
va_end(args);
-
- return rtn;
}
EXPORT_SYMBOL(ath_printk);