xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wireless-2.6' into wireless-next-2.6

Browse Source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-6000.c
This commit is contained in:
Reinette Chatre
2010-04-16 13:43:40 -07:00
parent a5e944f1d9 f2fa1b015e
commit 8715fa28fb
8 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@@ -1264,6 +1264,7 @@ struct iwl_priv {
struct work_struct tt_work;
struct work_struct ct_enter;
struct work_struct ct_exit;
struct work_struct start_internal_scan;
struct tasklet_struct irq_tasklet;