diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-09-23 19:45:27 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-24 09:28:51 +0200 |
| commit | 3ae3cf6154a6d4e929396f2694b68714a9ce237b (patch) | |
| tree | 45c5b832c3be8fa2c06c0687088894d9a2956ddf /patches/0059-uuid-in-mei/nfc.patch | |
| parent | 1b4e6ad4d927c7998fa578f2d29e0c4ec01a9217 (diff) | |
backports: Remove NFC support
I am not aware of any user of the NFC coded in backports, at least I
haven't seen any patches regarding this. Remove this code to reduce the
efforts needed in the backports project.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0059-uuid-in-mei/nfc.patch')
| -rw-r--r-- | patches/0059-uuid-in-mei/nfc.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/patches/0059-uuid-in-mei/nfc.patch b/patches/0059-uuid-in-mei/nfc.patch deleted file mode 100644 index 9953c819..00000000 --- a/patches/0059-uuid-in-mei/nfc.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/drivers/nfc/microread/mei.c -+++ b/drivers/nfc/microread/mei.c -@@ -67,7 +67,13 @@ static int microread_mei_remove(struct m - } - - static struct mei_cl_device_id microread_mei_tbl[] = { -+#if LINUX_VERSION_IS_GEQ(4,4,0) - { MICROREAD_DRIVER_NAME, MEI_NFC_UUID, MEI_CL_VERSION_ANY}, -+#elif LINUX_VERSION_IS_GEQ(4,2,0) -+ { MICROREAD_DRIVER_NAME, MEI_NFC_UUID}, -+#else -+ { MICROREAD_DRIVER_NAME}, -+#endif - - /* required last entry */ - { } ---- a/drivers/nfc/pn544/mei.c -+++ b/drivers/nfc/pn544/mei.c -@@ -67,7 +67,13 @@ static int pn544_mei_remove(struct mei_c - } - - static struct mei_cl_device_id pn544_mei_tbl[] = { -+#if LINUX_VERSION_IS_GEQ(4,4,0) - { PN544_DRIVER_NAME, MEI_NFC_UUID, MEI_CL_VERSION_ANY}, -+#elif LINUX_VERSION_IS_GEQ(4,2,0) -+ { PN544_DRIVER_NAME, MEI_NFC_UUID}, -+#else -+ { PN544_DRIVER_NAME}, -+#endif - - /* required last entry */ - { } |