diff options
| author | Mark Brown <broonie@kernel.org> | 2021-07-27 03:36:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-07-27 03:36:23 +0100 |
| commit | 5a0b5fbe7b41515ebf5e5cb1f70a6bd220f44df2 (patch) | |
| tree | 4c87298c3ad3c7b58c169e56cace092b80442372 /drivers/nfc/nxp-nci | |
| parent | c72249d40e91c77de63b782a84b115038341fde7 (diff) | |
| parent | 268ca4129d8da764fdf72916f762a1145c6ea743 (diff) | |
| download | linux-next-5a0b5fbe7b41515ebf5e5cb1f70a6bd220f44df2.tar.gz | |
Merge remote-tracking branch 'net-next/master'
# Conflicts:
# drivers/bus/mhi/pci_generic.c
Diffstat (limited to 'drivers/nfc/nxp-nci')
| -rw-r--r-- | drivers/nfc/nxp-nci/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/nxp-nci/core.c b/drivers/nfc/nxp-nci/core.c index 2b0c7232e91f..518e2afb43a8 100644 --- a/drivers/nfc/nxp-nci/core.c +++ b/drivers/nfc/nxp-nci/core.c @@ -83,7 +83,7 @@ static int nxp_nci_send(struct nci_dev *ndev, struct sk_buff *skb) return r; } -static struct nci_ops nxp_nci_ops = { +static const struct nci_ops nxp_nci_ops = { .open = nxp_nci_open, .close = nxp_nci_close, .send = nxp_nci_send, |