diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-02-23 14:55:25 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-28 17:50:46 +0100 |
| commit | 5af55933e063c01f64bba78f352e95b978a47cc1 (patch) | |
| tree | 8239d5dd1cf11e3eb0acc7ac1e68ace141a9c35c /target/linux/x86/patches-5.4/800-hwmon-w83627ehf-dont-claim-nct677x.patch | |
| parent | 4e0c54bc5bc8381e031af5147b66b4dadeecc626 (diff) | |
| download | upstream-5af55933e063c01f64bba78f352e95b978a47cc1.tar.gz upstream-5af55933e063c01f64bba78f352e95b978a47cc1.tar.bz2 upstream-5af55933e063c01f64bba78f352e95b978a47cc1.zip | |
x86: copy kernel patches from 4.19 to 5.4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/x86/patches-5.4/800-hwmon-w83627ehf-dont-claim-nct677x.patch')
| -rw-r--r-- | target/linux/x86/patches-5.4/800-hwmon-w83627ehf-dont-claim-nct677x.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/x86/patches-5.4/800-hwmon-w83627ehf-dont-claim-nct677x.patch b/target/linux/x86/patches-5.4/800-hwmon-w83627ehf-dont-claim-nct677x.patch new file mode 100644 index 0000000000..ef2e1333e7 --- /dev/null +++ b/target/linux/x86/patches-5.4/800-hwmon-w83627ehf-dont-claim-nct677x.patch @@ -0,0 +1,30 @@ +--- a/drivers/hwmon/w83627ehf.c ++++ b/drivers/hwmon/w83627ehf.c +@@ -2717,8 +2717,8 @@ static int __init w83627ehf_find(int sio + static const char sio_name_W83627UHG[] __initconst = "W83627UHG"; + static const char sio_name_W83667HG[] __initconst = "W83667HG"; + static const char sio_name_W83667HG_B[] __initconst = "W83667HG-B"; +- static const char sio_name_NCT6775[] __initconst = "NCT6775F"; +- static const char sio_name_NCT6776[] __initconst = "NCT6776F"; ++/* static const char sio_name_NCT6775[] __initconst = "NCT6775F"; ++ static const char sio_name_NCT6776[] __initconst = "NCT6776F"; */ + + u16 val; + const char *sio_name; +@@ -2762,14 +2762,14 @@ static int __init w83627ehf_find(int sio + sio_data->kind = w83667hg_b; + sio_name = sio_name_W83667HG_B; + break; +- case SIO_NCT6775_ID: ++/* case SIO_NCT6775_ID: + sio_data->kind = nct6775; + sio_name = sio_name_NCT6775; + break; + case SIO_NCT6776_ID: + sio_data->kind = nct6776; + sio_name = sio_name_NCT6776; +- break; ++ break; */ + default: + if (val != 0xffff) + pr_debug("unsupported chip ID: 0x%04x\n", val); |