diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-21 21:29:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-21 21:29:40 +0200 |
| commit | 69e3948aaa559670da2662ad9d5cbc782bfc6885 (patch) | |
| tree | 9cc3ef9f538b813d53a31056a93f8e56401569f7 /include/net/nfc | |
| parent | bonding: fix wq initialization for links created via netlink (diff) | |
| parent | nfc: fix get_unaligned_...() misuses (diff) | |
| download | linux-69e3948aaa559670da2662ad9d5cbc782bfc6885.tar.xz linux-69e3948aaa559670da2662ad9d5cbc782bfc6885.zip | |
Merge tag 'nfc-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.12 pull request
This is the NFC pull request for 4.12. We have:
- Improvements for the pn533 command queue handling and device
registration order.
- Removal of platform data for the pn544 and st21nfca drivers.
- Additional device tree options to support more trf7970a hardware options.
- Support for Sony's RC-S380P through the port100 driver.
- Removal of the obsolte nfcwilink driver.
- Headers inclusion cleanups (miscdevice.h, unaligned.h) for many drivers.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/nfc')
| -rw-r--r-- | include/net/nfc/nfc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h index 1a3de8b34ad2..bbdc73a3239d 100644 --- a/include/net/nfc/nfc.h +++ b/include/net/nfc/nfc.h @@ -27,6 +27,7 @@ #include <linux/device.h> #include <linux/skbuff.h> +#define nfc_dbg(dev, fmt, ...) dev_dbg((dev), "NFC: " fmt, ##__VA_ARGS__) #define nfc_info(dev, fmt, ...) dev_info((dev), "NFC: " fmt, ##__VA_ARGS__) #define nfc_err(dev, fmt, ...) dev_err((dev), "NFC: " fmt, ##__VA_ARGS__) |