--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -322,83 +322,59 @@ static int b43_ratelimit(struct b43_wl *
+@@ -334,83 +334,59 @@ static int b43_ratelimit(struct b43_wl *
void b43info(struct b43_wl *wl, const char *fmt, ...)
{
va_end(args);
}
#endif /* DEBUG */
---- a/drivers/net/wireless/ath/main.c
-+++ b/drivers/net/wireless/ath/main.c
-@@ -60,16 +60,13 @@ EXPORT_SYMBOL(ath_rxbuf_alloc);
- int ath_printk(const char *level, struct ath_common *common,
- const char *fmt, ...)
- {
-- struct va_format vaf;
- va_list args;
- int rtn;
-
- va_start(args, fmt);
-
-- vaf.fmt = fmt;
-- vaf.va = &args;
--
-- rtn = printk("%sath: %pV", level, &vaf);
-+ printk("%sath: ", level);
-+ rtn = vprintk(fmt, args);
-
- va_end(args);
-