Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76b733d1 authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

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: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent d52736e2

drivers/nfc/st-nci/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

include/linux/platform_data/st_nci.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * 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_ */