forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	drivers/net/wireless/ath/ath6kl/usb.c
This commit is contained in:
Kalle Valo 2012-01-13 13:57:45 +02:00
commit a0afd4f7c1
3897 changed files with 109279 additions and 66721 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/ath/ath6kl/init.c
View file

@ -444,7 +444,7 @@ static int ath6kl_target_config_wlan_params(struct ath6kl *ar, int idx)
ath6kl_dbg(ATH6KL_DBG_TRC, "failed to request P2P "
"capabilities (%d) - assuming P2P not "
"supported\n", ret);
ar->p2p = 0;
ar->p2p = false;
}
}