diff options
Diffstat (limited to 'patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch')
| -rw-r--r-- | patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch b/patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch index 69e20e26..903cac30 100644 --- a/patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch +++ b/patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch @@ -1,11 +1,13 @@ --- a/drivers/nfc/microread/mei.c +++ b/drivers/nfc/microread/mei.c -@@ -67,7 +67,11 @@ static int microread_mei_remove(struct m +@@ -67,7 +67,13 @@ 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}, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0) + { MICROREAD_DRIVER_NAME, MEI_NFC_UUID, MEI_CL_VERSION_ANY}, ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) ++ { MICROREAD_DRIVER_NAME, MEI_NFC_UUID}, +#else + { MICROREAD_DRIVER_NAME}, +#endif @@ -14,12 +16,14 @@ { } --- a/drivers/nfc/pn544/mei.c +++ b/drivers/nfc/pn544/mei.c -@@ -67,7 +67,11 @@ static int pn544_mei_remove(struct 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_CODE >= KERNEL_VERSION(4,2,0) - { PN544_DRIVER_NAME, MEI_NFC_UUID}, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0) + { PN544_DRIVER_NAME, MEI_NFC_UUID, MEI_CL_VERSION_ANY}, ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) ++ { PN544_DRIVER_NAME, MEI_NFC_UUID}, +#else + { PN544_DRIVER_NAME}, +#endif |