diff options
| author |   Samuel Ortiz <sameo@linux.intel.com> | 2015-10-23 17:05:37 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-10-25 18:20:03 +0100 |
| commit | dc42143b8468b1fe6385962d1d78ddadc76c5168 (patch) | |
| tree | dd6a5208fd5f66992f19112b7bfb04493b9a1e44 /drivers/nfc | |
| parent | NFC: delete null dereference (diff) | |
| download | linux-dev-dc42143b8468b1fe6385962d1d78ddadc76c5168.tar.xz linux-dev-dc42143b8468b1fe6385962d1d78ddadc76c5168.zip | |
NFC: st-nci: Rename st-nci_se.c
Rename it to se.c to keep the driver files namespace consistent.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/st-nci/Makefile | 2 | ||||
| -rw-r--r-- | drivers/nfc/st-nci/core.c | 2 | ||||
| -rw-r--r-- | drivers/nfc/st-nci/se.c (renamed from drivers/nfc/st-nci/st-nci_se.c) | 2 | ||||
| -rw-r--r-- | drivers/nfc/st-nci/se.h (renamed from drivers/nfc/st-nci/st-nci_se.h) | 0 | ||||
| -rw-r--r-- | drivers/nfc/st-nci/st-nci.h | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nfc/st-nci/Makefile b/drivers/nfc/st-nci/Makefile index 348ce76f2177..594c63d60070 100644 --- a/drivers/nfc/st-nci/Makefile +++ b/drivers/nfc/st-nci/Makefile @@ -2,7 +2,7 @@ # Makefile for ST21NFCB NCI based NFC driver # -st-nci-objs = ndlc.o core.o st-nci_se.o +st-nci-objs = ndlc.o core.o se.o obj-$(CONFIG_NFC_ST_NCI) += st-nci.o st-nci_i2c-objs = i2c.o diff --git a/drivers/nfc/st-nci/core.c b/drivers/nfc/st-nci/core.c index c419d3943973..8d1fdd2ee498 100644 --- a/drivers/nfc/st-nci/core.c +++ b/drivers/nfc/st-nci/core.c @@ -24,7 +24,7 @@ #include <linux/delay.h> #include "st-nci.h" -#include "st-nci_se.h" +#include "se.h" #define DRIVER_DESC "NCI NFC driver for ST_NCI" diff --git a/drivers/nfc/st-nci/st-nci_se.c b/drivers/nfc/st-nci/se.c index c742ef65a05a..bb8d1dd98c85 100644 --- a/drivers/nfc/st-nci/st-nci_se.c +++ b/drivers/nfc/st-nci/se.c @@ -23,7 +23,7 @@ #include <net/nfc/nci_core.h> #include "st-nci.h" -#include "st-nci_se.h" +#include "se.h" struct st_nci_pipe_info { u8 pipe_state; diff --git a/drivers/nfc/st-nci/st-nci_se.h b/drivers/nfc/st-nci/se.h index ea66e879d67f..ea66e879d67f 100644 --- a/drivers/nfc/st-nci/st-nci_se.h +++ b/drivers/nfc/st-nci/se.h diff --git a/drivers/nfc/st-nci/st-nci.h b/drivers/nfc/st-nci/st-nci.h index 850a2395deb7..b39b8cc63dcb 100644 --- a/drivers/nfc/st-nci/st-nci.h +++ b/drivers/nfc/st-nci/st-nci.h @@ -19,7 +19,7 @@ #ifndef __LOCAL_ST_NCI_H_ #define __LOCAL_ST_NCI_H_ -#include "st-nci_se.h" +#include "se.h" #include "ndlc.h" /* Define private flags: */ |