Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
	drivers/net/wireless/ath/ath6kl/init.c
This commit is contained in:
Kalle Valo
2011-12-16 21:10:39 +02:00
7655 changed files with 342408 additions and 170690 deletions

View File

@@ -46,8 +46,8 @@ enum ATH6K_DEBUG_MASK {
};
extern unsigned int debug_mask;
extern int ath6kl_printk(const char *level, const char *fmt, ...)
__attribute__ ((format (printf, 2, 3)));
extern __printf(2, 3)
int ath6kl_printk(const char *level, const char *fmt, ...);
#define ath6kl_info(fmt, ...) \
ath6kl_printk(KERN_INFO, fmt, ##__VA_ARGS__)