diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-06 10:47:12 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-06 10:47:12 -0500 |
| commit | d39aeaf260e7d1ec6a677beed230a0406d0069a6 (patch) | |
| tree | 1f5881fc037eaf55e83d56b09cfb194274419ce4 /drivers/nfc/pn533.c | |
| parent | 40e4783ee62ac656a9a0fa3b512b6aee4f07d2d1 (diff) | |
| parent | d7a4858c0fde8383f7aa494eda0fba6bef3f2fec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/nfc/pn533.c')
| -rw-r--r-- | drivers/nfc/pn533.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index 7bcb1febef0..dbf214ef732 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c @@ -1339,7 +1339,7 @@ error: return 0; } -int pn533_data_exchange(struct nfc_dev *nfc_dev, u32 target_idx, +static int pn533_data_exchange(struct nfc_dev *nfc_dev, u32 target_idx, struct sk_buff *skb, data_exchange_cb_t cb, void *cb_context) |