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/acpi/osi.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/acpi/osi.c')
| -rw-r--r-- | drivers/acpi/osi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/osi.c b/drivers/acpi/osi.c index 19cdd8a783a9..76998a51bf99 100644 --- a/drivers/acpi/osi.c +++ b/drivers/acpi/osi.c @@ -312,7 +312,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d) * Note that _OSI("Linux")/_OSI("Darwin") determined here can be overridden * by acpi_osi=!Linux/acpi_osi=!Darwin command line options. */ -static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = { { .callback = dmi_disable_osi_vista, .ident = "Fujitsu Siemens", |