diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 13:03:18 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 13:03:18 +0300 |
| commit | d267b8d6c65ed7636a412ca479b96df7c0f5b27b (patch) | |
| tree | f613d83fab377bf3599eb9ffc3cdf34df0a6e48e /drivers/nfc/st-nci/ndlc.h | |
| parent | 42baa2581c92f8d07e7260506c8d41caf14b0fc3 (diff) | |
| parent | 1eab0e42450c6038e2bb17da438370fe639973f3 (diff) | |
| download | linux-d267b8d6c65ed7636a412ca479b96df7c0f5b27b.tar.xz | |
Merge branch 'linus' into x86/apic
Pull in update changes so we can apply conflicting patches
Diffstat (limited to 'drivers/nfc/st-nci/ndlc.h')
| -rw-r--r-- | drivers/nfc/st-nci/ndlc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/nfc/st-nci/ndlc.h b/drivers/nfc/st-nci/ndlc.h index 6361005ef003..bdf78ffd5bb7 100644 --- a/drivers/nfc/st-nci/ndlc.h +++ b/drivers/nfc/st-nci/ndlc.h @@ -22,6 +22,8 @@ #include <linux/skbuff.h> #include <net/nfc/nfc.h> +struct st_nci_se_status; + /* Low Level Transport description */ struct llt_ndlc { struct nci_dev *ndev; @@ -55,6 +57,7 @@ void ndlc_close(struct llt_ndlc *ndlc); int ndlc_send(struct llt_ndlc *ndlc, struct sk_buff *skb); void ndlc_recv(struct llt_ndlc *ndlc, struct sk_buff *skb); int ndlc_probe(void *phy_id, struct nfc_phy_ops *phy_ops, struct device *dev, - int phy_headroom, int phy_tailroom, struct llt_ndlc **ndlc_id); + int phy_headroom, int phy_tailroom, struct llt_ndlc **ndlc_id, + struct st_nci_se_status *se_status); void ndlc_remove(struct llt_ndlc *ndlc); #endif /* __LOCAL_NDLC_H__ */ |