| From | Greg Kroah-Hartman <> | Subject | [PATCH 4.2 001/134] nfc: st-nci: Remove duplicate file platform_data/st_nci.h | Date | Sat, 26 Sep 2015 13:54:13 -0700 |
| |
4.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Ricard <christophe.ricard@gmail.com>
commit 76b733d15874128ee2d0365b4cbe7d51decd8d37 upstream.
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.
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- drivers/nfc/st-nci/i2c.c | 2 +- include/linux/platform_data/st_nci.h | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-)
--- 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" --- a/include/linux/platform_data/st_nci.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Driver include for ST NCI NFC chip family. - * - * Copyright (C) 2014-2015 STMicroelectronics SAS. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef _ST_NCI_H_ -#define _ST_NCI_H_ - -#define ST_NCI_DRIVER_NAME "st_nci" - -struct st_nci_nfc_platform_data { - unsigned int gpio_reset; - unsigned int irq_polarity; -}; - -#endif /* _ST_NCI_H_ */
|