The uuid member was added to the struct mei_cl_device_id in this commit:
commit c93b76b34b4d8dbe8e3443eb27e49ac60034342b
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Thu May 7 15:54:02 2015 +0300
mei: bus: report also uuid in module alias
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
.../network/0059-uuid-in-mei/INFO | 7 ++++++
.../network/0059-uuid-in-mei/nfc.patch | 28 ++++++++++++++++++++++
2 files changed, 35 insertions(+)
create mode 100644 patches/collateral-evolutions/network/0059-uuid-in-mei/INFO
create mode 100644 patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch
diff --git a/patches/collateral-evolutions/network/0059-uuid-in-mei/INFO b/patches/collateral-evolutions/network/0059-uuid-in-mei/INFO
new file mode 100644
index 0000000..4c96bf5
--- /dev/null
+++ b/patches/collateral-evolutions/network/0059-uuid-in-mei/INFO
@@ -0,0 +1,7 @@
+The uuid member was added to the struct mei_cl_device_id in this commit:
+commit c93b76b34b4d8dbe8e3443eb27e49ac60034342b
+Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
+Date: Thu May 7 15:54:02 2015 +0300
+
+ mei: bus: report also uuid in module alias
+
diff --git a/patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch b/patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch
new file mode 100644
index 0000000..69e20e2
--- /dev/null
+++ b/patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch
@@ -0,0 +1,28 @@
+--- a/drivers/nfc/microread/mei.c
++++ b/drivers/nfc/microread/mei.c
+@@ -67,7 +67,11 @@ static int microread_mei_remove(struct m
+ }
+
+ static struct mei_cl_device_id microread_mei_tbl[] = {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(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,11 @@ static int pn544_mei_remove(struct mei_c
+ }
+
+ static struct mei_cl_device_id pn544_mei_tbl[] = {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
+ { PN544_DRIVER_NAME, MEI_NFC_UUID},
++#else
++ { PN544_DRIVER_NAME},
++#endif
+
+ /* required last entry */
+ { }
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
