History

Merge tag 'nfc-next-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next

Samuel Ortiz says: ==================== NFC 4.6 pull request This is a very small one this time, with only 5 patches. There are a couple of big items that could not be merged/finished on time. We have: - 2 LLCP fixes for a race and a potential OOM. - 2 cleanups for the pn544 and microread drivers. - 1 Maintainer addition for the s3fwrn5 driver. ====================

David S. Miller committed 10 years ago

Commit f4fa6e62 parents 0109988 079c2656 files · +10 −59Browse files

Showing the changes to include/linux/platform_data (1 of 6 files). Show all

Unified · Split

include/linux/platform_data/microread.h+0−35
@@ -1,35 +0,0 @@
1−/*
2− * Driver include for the Inside Secure microread NFC Chip.
3− *
4− * Copyright (C) 2011 Tieto Poland
5− * Copyright (C) 2012 Intel Corporation. All rights reserved.
6− *
7− * This program is free software; you can redistribute it and/or
8− * modify it under the terms of the GNU General Public License
9− * version 2 as published by the Free Software Foundation.
10− *
11− * This program is distributed in the hope that it will be useful,
12− * but WITHOUT ANY WARRANTY; without even the implied warranty of
13− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14− * GNU General Public License for more details.
15− *
16− * You should have received a copy of the GNU General Public License
17− * along with this program; if not, write to the Free Software
18− * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19− */
20−
21−#ifndef _MICROREAD_H
22−#define _MICROREAD_H
23−
24−#include <linux/i2c.h>
25−
26−#define MICROREAD_DRIVER_NAME "microread"
27−
28−/* board config platform data for microread */
29−struct microread_nfc_platform_data {
30− unsigned int rst_gpio;
31− unsigned int irq_gpio;
32− unsigned int ioh_gpio;
33−};
34−
35−#endif /* _MICROREAD_H */