diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-11-28 05:25:27 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-28 05:25:27 +0300 |
| commit | 5c39f26e67c984db0fa95f9faecf06eb0198dce7 (patch) | |
| tree | 821aaa43d3f5806134438daa531be6d171292c5f /drivers/nfc/s3fwrn5 | |
| parent | 6375da9dac8bec05a022f22ab22300cc824ec268 (diff) | |
| parent | c84e1efae022071a4fcf9f1899bf71777c49943a (diff) | |
| download | linux-5c39f26e67c984db0fa95f9faecf06eb0198dce7.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in CAN, keep the net-next + the byteswap wrapper.
Conflicts:
drivers/net/can/usb/gs_usb.c
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/nfc/s3fwrn5')
| -rw-r--r-- | drivers/nfc/s3fwrn5/i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c index 0ffa389066a0..ae26594c7302 100644 --- a/drivers/nfc/s3fwrn5/i2c.c +++ b/drivers/nfc/s3fwrn5/i2c.c @@ -25,8 +25,8 @@ struct s3fwrn5_i2c_phy { struct i2c_client *i2c_dev; struct nci_dev *ndev; - unsigned int gpio_en; - unsigned int gpio_fw_wake; + int gpio_en; + int gpio_fw_wake; struct mutex mutex; |