diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-05 21:42:34 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-07 17:44:17 +0100 |
commit | 7d07501a8b71a63644693133b94a46dc72bf113b (patch) | |
tree | 2a419e3bbe8189d6666dee9635b4db2c33e4a880 /patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch | |
parent | 258c9f45411bd468953e16e60cc4c1821f322320 (diff) |
patches: refresh on next-20151013backports-20151013
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.72 [ OK ]
4 3.3.8 [ OK ]
5 3.4.110 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.92 [ OK ]
12 3.11.10 [ OK ]
13 3.12.49 [ OK ]
14 3.13.11 [ OK ]
15 3.14.56 [ OK ]
16 3.15.10 [ OK ]
17 3.16.7 [ OK ]
18 3.17.8 [ OK ]
19 3.18.23 [ OK ]
20 3.19.8 [ OK ]
21 4.0.9 [ OK ]
22 4.1.12 [ OK ]
23 4.2.5 [ OK ]
24 4.3-rc7 [ OK ]
manual changes done to the following patches:
* patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch
* patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch
* patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 |