diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-10 12:01:14 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-10 12:01:14 +0800 |
| commit | 7785301d9209cf083369c6f088cd1d48ec417863 (patch) | |
| tree | 693ad3a1ebdc818a37abebbd8257820604ea8a35 /drivers/platform | |
| parent | 19192a140ad72b5bd0d57620bfe236bc03561bb6 (diff) | |
| parent | f02e043c5ee3014ba0fbae38e699008385c99d7b (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/asus-nb-wmi.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c index 131fee2b093e..a3661cc44f86 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c @@ -128,6 +128,15 @@ static const struct dmi_system_id asus_quirks[] = { }, { .callback = dmi_matched, + .ident = "ASUSTeK COMPUTER INC. X45U", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "X45U"), + }, + .driver_data = &quirk_asus_wapf4, + }, + { + .callback = dmi_matched, .ident = "ASUSTeK COMPUTER INC. X456UA", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |