diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-14 20:35:41 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-14 20:35:41 +0100 |
| commit | 5d22df200beccb1dea26fe4d8684ed93ae2f0aeb (patch) | |
| tree | 05220b08a0c9d170ad88e3b9ed0390750d22d8ea /net/nfc | |
| parent | b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set (diff) | |
| parent | iwlwifi: allow to switch to HT40 if not associated (diff) | |
| download | linux-5d22df200beccb1dea26fe4d8684ed93ae2f0aeb.tar.xz linux-5d22df200beccb1dea26fe4d8684ed93ae2f0aeb.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/nci/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 37de28e97330..c55f233a5e2c 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -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; |