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/applesmc.c | |
| parent | ba768535b467bb2d342a1581450394f1148dc8ae (diff) | |
| parent | 6faadbbb7f9da70ce484f98f72223c20125a1009 (diff) | |
| download | linux-e75f801f1febabfa3cf3dcb3a1a05bf3c243d41e.tar.gz linux-e75f801f1febabfa3cf3dcb3a1a05bf3c243d41e.tar.bz2 linux-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/applesmc.c')
| -rw-r--r-- | drivers/hwmon/applesmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 76c34f4fde13..5c677ba44014 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c @@ -1247,7 +1247,7 @@ static int applesmc_dmi_match(const struct dmi_system_id *id) * Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". * So we need to put "Apple MacBook Pro" before "Apple MacBook". */ -static __initdata struct dmi_system_id applesmc_whitelist[] = { +static const struct dmi_system_id applesmc_whitelist[] __initconst = { { applesmc_dmi_match, "Apple MacBook Air", { DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, |