diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-12-04 11:27:40 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-12-04 11:27:40 -0500 |
| commit | 04bb7ecf8854186f47fb1ea321fc77e7bc931993 (patch) | |
| tree | d868ed692edebb2b2a31ecb16c5ab057fb3b008d /include/linux/platform_data | |
| parent | ea375117013dcca43ea4ffeb920735ab71c75ef3 (diff) | |
| parent | e479ce479743984a5d4581749f9aaa9c3bfd65e4 (diff) | |
| download | cachepc-linux-04bb7ecf8854186f47fb1ea321fc77e7bc931993.tar.gz cachepc-linux-04bb7ecf8854186f47fb1ea321fc77e7bc931993.zip | |
Merge tag 'nfc-next-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz <sameo@linux.intel.com> says:
"NFC: 3.19 pull request
This is the NFC pull request for 3.19.
With this one we get:
- NFC digital improvements for DEP support: Chaining, NACK and ATN
support added.
- NCI improvements: Support for p2p target, SE IO operand addition,
SE operands extensions to support proprietary implementations, and
a few fixes.
- NFC HCI improvements: OPEN_PIPE and NOTIFY_ALL_CLEARED support,
and SE IO operand addition.
- A bunch of minor improvements and fixes for STMicro st21nfcb and
st21nfca"
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/st21nfca.h | 1 | ||||
| -rw-r--r-- | include/linux/platform_data/st21nfcb.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/platform_data/st21nfca.h b/include/linux/platform_data/st21nfca.h index 1730312398ff..5087fff96d86 100644 --- a/include/linux/platform_data/st21nfca.h +++ b/include/linux/platform_data/st21nfca.h @@ -24,7 +24,6 @@ #define ST21NFCA_HCI_DRIVER_NAME "st21nfca_hci" struct st21nfca_nfc_platform_data { - unsigned int gpio_irq; unsigned int gpio_ena; unsigned int irq_polarity; }; diff --git a/include/linux/platform_data/st21nfcb.h b/include/linux/platform_data/st21nfcb.h index 2d11f1f5efab..c3b432f5b63e 100644 --- a/include/linux/platform_data/st21nfcb.h +++ b/include/linux/platform_data/st21nfcb.h @@ -24,7 +24,6 @@ #define ST21NFCB_NCI_DRIVER_NAME "st21nfcb_nci" struct st21nfcb_nfc_platform_data { - unsigned int gpio_irq; unsigned int gpio_reset; unsigned int irq_polarity; }; |