diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 14:25:14 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 14:41:59 -0400 |
commit | 7eab0f64a9eba5405222fdef0ede2468bf495efd (patch) | |
tree | ec99640b8d0b12adbfacb85c27683125debd14f2 /drivers/net/wireless/ath/ath5k/led.c | |
parent | cade455596504fae8e134a27189713ddf7c6d04d (diff) | |
parent | 8065248069097dddf9945acfb2081025e9618c16 (diff) |
Merge branch 'master' into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
net/wireless/nl80211.c
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/led.c')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/led.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c index c1151c723711..b9f708a45f4e 100644 --- a/drivers/net/wireless/ath/ath5k/led.c +++ b/drivers/net/wireless/ath/ath5k/led.c | |||
@@ -39,6 +39,8 @@ | |||
39 | * | 39 | * |
40 | */ | 40 | */ |
41 | 41 | ||
42 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
43 | |||
42 | #include <linux/pci.h> | 44 | #include <linux/pci.h> |
43 | #include "ath5k.h" | 45 | #include "ath5k.h" |
44 | 46 | ||