diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-08-14 22:33:30 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-08-17 00:35:06 +0200 |
| commit | 76b733d15874128ee2d0365b4cbe7d51decd8d37 (patch) | |
| tree | c87b0ea3374f4f59fe59890fceb73c274fec3837 /drivers/nfc/st-nci | |
| parent | d52736e24fe2e927c26817256f8d1a3c8b5d51a0 (diff) | |
nfc: st-nci: Remove duplicate file platform_data/st_nci.h
commit "nfc: st-nci: Rename st21nfcb to st-nci" adds
include/linux/platform_data/st_nci.h duplicated with
include/linux/platform_data/st-nci.h.
Only drivers/nfc/st-nci/i2c.c uses platform_data/st_nci.h.
Cc: stable@vger.kernel.org
Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/st-nci')
| -rw-r--r-- | drivers/nfc/st-nci/i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c index 06175ce769bb..b2a467c2d668 100644 --- a/drivers/nfc/st-nci/i2c.c +++ b/drivers/nfc/st-nci/i2c.c @@ -25,7 +25,7 @@ #include <linux/interrupt.h> #include <linux/delay.h> #include <linux/nfc.h> -#include <linux/platform_data/st_nci.h> +#include <linux/platform_data/st-nci.h> #include "ndlc.h" |