Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn.c
This commit is contained in:
@@ -71,7 +71,7 @@ static int __nci_request(struct nci_dev *ndev,
|
||||
__u32 timeout)
|
||||
{
|
||||
int rc = 0;
|
||||
unsigned long completion_rc;
|
||||
long completion_rc;
|
||||
|
||||
ndev->req_status = NCI_REQ_PEND;
|
||||
|
||||
|
Reference in New Issue
Block a user