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/firmware | |
| parent | ba768535b467bb2d342a1581450394f1148dc8ae (diff) | |
| parent | 6faadbbb7f9da70ce484f98f72223c20125a1009 (diff) | |
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/firmware')
| -rw-r--r-- | drivers/firmware/google/gsmi.c | 2 | ||||
| -rw-r--r-- | drivers/firmware/google/memconsole-x86-legacy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c index c46387160976..c8f169bf2e27 100644 --- a/drivers/firmware/google/gsmi.c +++ b/drivers/firmware/google/gsmi.c @@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8]) return local_hash_64(input, 32); } -static struct dmi_system_id gsmi_dmi_table[] __initdata = { +static const struct dmi_system_id gsmi_dmi_table[] __initconst = { { .ident = "Google Board", .matches = { diff --git a/drivers/firmware/google/memconsole-x86-legacy.c b/drivers/firmware/google/memconsole-x86-legacy.c index 8c1bf6dbdaa6..19bcbd10855b 100644 --- a/drivers/firmware/google/memconsole-x86-legacy.c +++ b/drivers/firmware/google/memconsole-x86-legacy.c @@ -126,7 +126,7 @@ static bool memconsole_ebda_init(void) return false; } -static struct dmi_system_id memconsole_dmi_table[] __initdata = { +static const struct dmi_system_id memconsole_dmi_table[] __initconst = { { .ident = "Google Board", .matches = { |