projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8065248
d97c121
)
Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
author
John W. Linville
<linville@tuxdriver.com>
Thu, 12 Apr 2012 19:02:19 +0000
(15:02 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Thu, 12 Apr 2012 19:02:19 +0000
(15:02 -0400)
1
2
drivers/net/wireless/ath/ath6kl/cfg80211.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath6kl/debug.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath6kl/init.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath6kl/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath6kl/txrx.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/ath/ath6kl/cfg80211.c
Simple merge
diff --cc
drivers/net/wireless/ath/ath6kl/debug.c
Simple merge
diff --cc
drivers/net/wireless/ath/ath6kl/init.c
Simple merge
diff --cc
drivers/net/wireless/ath/ath6kl/main.c
Simple merge
diff --cc
drivers/net/wireless/ath/ath6kl/txrx.c
index 521f0be990f1db589faca36aa2e7d98af963e668,0163182e79da2d9f650148645e6e30de49fe9caf..82f2f5cb475b0b3ba8e7bebf6fea1d86472d56fa
---
1
/
drivers/net/wireless/ath/ath6kl/txrx.c
---
2
/
drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/
drivers/net/wireless/ath/ath6kl/txrx.c
@@@
-15,10
-15,9
+15,11
@@@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include "core.h"
#include "debug.h"
+ #include "htc-ops.h"
/*
* tid - tid_mux0..tid_mux3