diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-12-16 14:10:39 -0500 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-12-16 14:10:39 -0500 |
| commit | 7e95e365d5399647a41e10059e4b09826b82d78b (patch) | |
| tree | 305c9968798adae3d9484657339fa39d2a5fdaac /drivers/net/wireless/ath/ath6kl/debug.h | |
| parent | 3ca9d1fc9aa64077645a26c396de9399b49ea226 (diff) | |
| parent | 5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f (diff) | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/init.c
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/debug.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/debug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h index 9b779aac83e7..e569c652e35c 100644 --- a/drivers/net/wireless/ath/ath6kl/debug.h +++ b/drivers/net/wireless/ath/ath6kl/debug.h | |||
| @@ -46,8 +46,8 @@ enum ATH6K_DEBUG_MASK { | |||
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | extern unsigned int debug_mask; | 48 | extern unsigned int debug_mask; |
| 49 | extern int ath6kl_printk(const char *level, const char *fmt, ...) | 49 | extern __printf(2, 3) |
| 50 | __attribute__ ((format (printf, 2, 3))); | 50 | int ath6kl_printk(const char *level, const char *fmt, ...); |
| 51 | 51 | ||
| 52 | #define ath6kl_info(fmt, ...) \ | 52 | #define ath6kl_info(fmt, ...) \ |
| 53 | ath6kl_printk(KERN_INFO, fmt, ##__VA_ARGS__) | 53 | ath6kl_printk(KERN_INFO, fmt, ##__VA_ARGS__) |