diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-05 05:48:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-05 05:48:15 +0300 |
| commit | 15ab90f400781a801017ea2bd8597e6eb3f39f79 (patch) | |
| tree | 561d350474e9eeecf4e0364291366b193460c974 /drivers/nfc/s3fwrn5/s3fwrn5.h | |
| parent | 197c949e7798fbf28cfadc69d9ca0c2abbf93191 (diff) | |
| parent | c6dc65d885b98898bf287aaf44e020077b41769f (diff) | |
| download | linux-15ab90f400781a801017ea2bd8597e6eb3f39f79.tar.xz | |
Merge tag 'nfc-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.5 pull request
This is the first NFC pull request for 4.5 and it brings:
- A new driver for the STMicroelectronics ST95HF NFC chipset.
The ST95HF is an NFC digital transceiver with an embedded analog
front-end and as such relies on the Linux NFC digital
implementation. This is the 3rd user of the NFC digital stack.
- ACPI support for the ST st-nci and st21nfca drivers.
- A small improvement for the nfcsim driver, as we can now tune
the Rx delay through sysfs.
- A bunch of minor cleanups and small fixes from Christophe Ricard,
for a few drivers and the NFC core code.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc/s3fwrn5/s3fwrn5.h')
| -rw-r--r-- | drivers/nfc/s3fwrn5/s3fwrn5.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/s3fwrn5/s3fwrn5.h b/drivers/nfc/s3fwrn5/s3fwrn5.h index 89210d4828b8..7d5e516036fb 100644 --- a/drivers/nfc/s3fwrn5/s3fwrn5.h +++ b/drivers/nfc/s3fwrn5/s3fwrn5.h @@ -44,7 +44,7 @@ struct s3fwrn5_info { void *phy_id; struct device *pdev; - struct s3fwrn5_phy_ops *phy_ops; + const struct s3fwrn5_phy_ops *phy_ops; unsigned int max_payload; struct s3fwrn5_fw_info fw_info; @@ -90,7 +90,7 @@ static inline int s3fwrn5_write(struct s3fwrn5_info *info, struct sk_buff *skb) } int s3fwrn5_probe(struct nci_dev **ndev, void *phy_id, struct device *pdev, - struct s3fwrn5_phy_ops *phy_ops, unsigned int max_payload); + const struct s3fwrn5_phy_ops *phy_ops, unsigned int max_payload); void s3fwrn5_remove(struct nci_dev *ndev); int s3fwrn5_recv_frame(struct nci_dev *ndev, struct sk_buff *skb, |