diff --git a/[refs] b/[refs] index 0b3614a04c49..824e19195b94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 874934f4d492d0926a104c2a4bfbf7c1701e2fd2 +refs/heads/master: 984d334f28c6a93231fe9de3ec42717469e90d4c diff --git a/trunk/drivers/nfc/pn544/pn544.c b/trunk/drivers/nfc/pn544/pn544.c index cf344450815c..cc666de3b8e5 100644 --- a/trunk/drivers/nfc/pn544/pn544.c +++ b/trunk/drivers/nfc/pn544/pn544.c @@ -714,8 +714,8 @@ static int pn544_hci_check_presence(struct nfc_hci_dev *hdev, return 0; } -void pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate, u8 event, - struct sk_buff *skb) +static void pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate, + u8 event, struct sk_buff *skb) { struct sk_buff *rgb_skb = NULL; int r = 0; diff --git a/trunk/net/nfc/hci/core.c b/trunk/net/nfc/hci/core.c index c2339c468d91..4b720ff20ee9 100644 --- a/trunk/net/nfc/hci/core.c +++ b/trunk/net/nfc/hci/core.c @@ -650,7 +650,7 @@ static int hci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target, return r; } -int hci_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb) +static int hci_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb) { struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);