summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorVincent Cuissard <cuissard@marvell.com>2015-10-26 05:27:42 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2015-10-26 23:21:38 -0400
commitfcd9d046fd8998cc984f2ff80e76f246ebca15b6 (patch)
treecca10ce5c49a17a575f30cfcc83923138747ff18 /net/nfc
parentb5b3e23e4cace008e1a30e8614a484d14dfd07a1 (diff)
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/Kconfig2
-rw-r--r--net/nfc/nci/Makefile3
-rw-r--r--net/nfc/nci/spi.c4
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
12config NFC_NCI_SPI 12config NFC_NCI_SPI
13 depends on NFC_NCI && SPI 13 depends on NFC_NCI && SPI
14 select CRC_CCITT 14 select CRC_CCITT
15 bool "NCI over SPI protocol support" 15 tristate "NCI over SPI protocol support"
16 default n 16 default n
17 help 17 help
18 NCI (NFC Controller Interface) is a communication protocol between 18 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
6 6
7nci-objs := core.o data.o lib.o ntf.o rsp.o hci.o 7nci-objs := core.o data.o lib.o ntf.o rsp.o hci.o
8 8
9nci-$(CONFIG_NFC_NCI_SPI) += spi.o 9nci_spi-y += spi.o
10obj-$(CONFIG_NFC_NCI_SPI) += nci_spi.o
10 11
11nci_uart-y += uart.o 12nci_uart-y += uart.o
12obj-$(CONFIG_NFC_NCI_UART) += nci_uart.o 13obj-$(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 @@
18 18
19#define pr_fmt(fmt) "nci_spi: %s: " fmt, __func__ 19#define pr_fmt(fmt) "nci_spi: %s: " fmt, __func__
20 20
21#include <linux/module.h>
22
21#include <linux/export.h> 23#include <linux/export.h>
22#include <linux/spi/spi.h> 24#include <linux/spi/spi.h>
23#include <linux/crc-ccitt.h> 25#include <linux/crc-ccitt.h>
@@ -320,3 +322,5 @@ done:
320 return skb; 322 return skb;
321} 323}
322EXPORT_SYMBOL_GPL(nci_spi_read); 324EXPORT_SYMBOL_GPL(nci_spi_read);
325
326MODULE_LICENSE("GPL");