diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-14 13:10:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-14 13:10:48 -0700 |
commit | e75f801f1febabfa3cf3dcb3a1a05bf3c243d41e (patch) | |
tree | 4f557d17386a42b3db212eb96e552fd45ec04f82 /drivers/hwmon/acpi_power_meter.c | |
parent | Merge tag 'pinctrl-v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl (diff) | |
parent | dmi: Mark all struct dmi_system_id instances const (diff) | |
download | linux-dev-e75f801f1febabfa3cf3dcb3a1a05bf3c243d41e.tar.xz linux-dev-e75f801f1febabfa3cf3dcb3a1a05bf3c243d41e.zip |
Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull dmi update from Jean Delvare:
"Mark all struct dmi_system_id instances const"
* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
dmi: Mark all struct dmi_system_id instances const
Diffstat (limited to 'drivers/hwmon/acpi_power_meter.c')
-rw-r--r-- | drivers/hwmon/acpi_power_meter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index 579bdf93be43..14a94d90c028 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d) return 0; } -static struct dmi_system_id __initdata pm_dmi_table[] = { +static const struct dmi_system_id pm_dmi_table[] __initconst = { { enable_cap_knobs, "IBM Active Energy Manager", { |