diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-29 09:49:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-29 09:49:55 +0300 |
| commit | b8f8be3f043d6dba7d6c3426e4597d2ebf5a3547 (patch) | |
| tree | 8f2b80088b24b7c5fb0aba4c6b3b45b5ca4a2bb2 /include/linux/platform_data/st21nfcb.h | |
| parent | ff660f75be36e6db75d45dc742a4a468c5a9c20d (diff) | |
| parent | 0a5942c8e1480db4b8ee7a8d643e4945ef2f8fed (diff) | |
| download | linux-b8f8be3f043d6dba7d6c3426e4597d2ebf5a3547.tar.xz | |
Merge tag 'nfc-next-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
NFC: 3.20 first pull request
This is the first NFC pull request for 3.20.
With this one we have:
- Secure element support for the ST Micro st21nfca driver. This depends
on a few HCI internal changes in order for example to support more
than one secure element per controller.
- ACPI support for NXP's pn544 HCI driver. This controller is found on
many x86 SoCs and is typically enumerated on the ACPI bus there.
- A few st21nfca and st21nfcb fixes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/platform_data/st21nfcb.h')
| -rw-r--r-- | include/linux/platform_data/st21nfcb.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/platform_data/st21nfcb.h b/include/linux/platform_data/st21nfcb.h index c3b432f5b63e..b023373d9874 100644 --- a/include/linux/platform_data/st21nfcb.h +++ b/include/linux/platform_data/st21nfcb.h @@ -19,8 +19,6 @@ #ifndef _ST21NFCB_NCI_H_ #define _ST21NFCB_NCI_H_ -#include <linux/i2c.h> - #define ST21NFCB_NCI_DRIVER_NAME "st21nfcb_nci" struct st21nfcb_nfc_platform_data { @@ -28,4 +26,4 @@ struct st21nfcb_nfc_platform_data { unsigned int irq_polarity; }; -#endif /* _ST21NFCA_HCI_H_ */ +#endif /* _ST21NFCB_NCI_H_ */ |