diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-06-06 20:45:37 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-06-06 20:45:37 +0300 |
commit | 8dd06ef34b6e2f41b29fbf5fc1663780f2524285 (patch) | |
tree | d59152f37ea7b36c3cf1778e20b85239f89c4e77 /drivers/hwmon/scmi-hwmon.c | |
parent | 642aa86eaf8f1e6fe894f20fd7f12f0db52ee03c (diff) | |
parent | d0ac7079d5fcaaaf3eb99c197a08ac1b399754f4 (diff) | |
download | linux-8dd06ef34b6e2f41b29fbf5fc1663780f2524285.tar.xz |
Merge branch 'next' into for-linus
Prepare input updates for 5.8 merge window.
Diffstat (limited to 'drivers/hwmon/scmi-hwmon.c')
-rw-r--r-- | drivers/hwmon/scmi-hwmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/scmi-hwmon.c b/drivers/hwmon/scmi-hwmon.c index 8a7732c0bef3..286d3cfda7de 100644 --- a/drivers/hwmon/scmi-hwmon.c +++ b/drivers/hwmon/scmi-hwmon.c @@ -259,7 +259,7 @@ static int scmi_hwmon_probe(struct scmi_device *sdev) } static const struct scmi_device_id scmi_id_table[] = { - { SCMI_PROTOCOL_SENSOR }, + { SCMI_PROTOCOL_SENSOR, "hwmon" }, { }, }; MODULE_DEVICE_TABLE(scmi, scmi_id_table); |