diff options
| author | Vincent Cuissard <cuissard@marvell.com> | 2015-10-26 10:27:42 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-10-27 04:21:38 +0100 |
| commit | fcd9d046fd8998cc984f2ff80e76f246ebca15b6 (patch) | |
| tree | cca10ce5c49a17a575f30cfcc83923138747ff18 /net/nfc | |
| parent | b5b3e23e4cace008e1a30e8614a484d14dfd07a1 (diff) | |
| download | linux-stable-fcd9d046fd8998cc984f2ff80e76f246ebca15b6.tar.gz linux-stable-fcd9d046fd8998cc984f2ff80e76f246ebca15b6.tar.bz2 linux-stable-fcd9d046fd8998cc984f2ff80e76f246ebca15b6.zip | |
NFC: NCI: move generic spi driver to a module
SPI driver should be a module.
Signed-off-by: Vincent Cuissard <cuissard@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/nci/Kconfig | 2 | ||||
| -rw-r--r-- | net/nfc/nci/Makefile | 3 | ||||
| -rw-r--r-- | net/nfc/nci/spi.c | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/net/nfc/nci/Kconfig b/net/nfc/nci/Kconfig index 901c1ddba841..85d4819ab657 100644 --- a/net/nfc/nci/Kconfig +++ b/net/nfc/nci/Kconfig @@ -12,7 +12,7 @@ config NFC_NCI config NFC_NCI_SPI depends on NFC_NCI && SPI select CRC_CCITT - bool "NCI over SPI protocol support" + tristate "NCI over SPI protocol support" default n help NCI (NFC Controller Interface) is a communication protocol between diff --git a/net/nfc/nci/Makefile b/net/nfc/nci/Makefile index b4b85b82e988..0ca31d9bf741 100644 --- a/net/nfc/nci/Makefile +++ b/net/nfc/nci/Makefile @@ -6,7 +6,8 @@ obj-$(CONFIG_NFC_NCI) += nci.o nci-objs := core.o data.o lib.o ntf.o rsp.o hci.o -nci-$(CONFIG_NFC_NCI_SPI) += spi.o +nci_spi-y += spi.o +obj-$(CONFIG_NFC_NCI_SPI) += nci_spi.o nci_uart-y += uart.o obj-$(CONFIG_NFC_NCI_UART) += nci_uart.o diff --git a/net/nfc/nci/spi.c b/net/nfc/nci/spi.c index ec250e77763a..25153d0e33cf 100644 --- a/net/nfc/nci/spi.c +++ b/net/nfc/nci/spi.c @@ -18,6 +18,8 @@ #define pr_fmt(fmt) "nci_spi: %s: " fmt, __func__ +#include <linux/module.h> + #include <linux/export.h> #include <linux/spi/spi.h> #include <linux/crc-ccitt.h> @@ -320,3 +322,5 @@ done: return skb; } EXPORT_SYMBOL_GPL(nci_spi_read); + +MODULE_LICENSE("GPL"); |