diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 13:16:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 13:16:30 -0700 |
| commit | 22051d9c4a57d3b4a8b5a7407efc80c71c7bfb16 (patch) | |
| tree | de998ca05e1eafedcbba213bec82195764b5a068 /include | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux (diff) | |
| parent | platform/x86: asus: Rename "fan mode" to "fan boost mode" (diff) | |
| download | linux-dev-22051d9c4a57d3b4a8b5a7407efc80c71c7bfb16.tar.xz linux-dev-22051d9c4a57d3b4a8b5a7407efc80c71c7bfb16.zip | |
Merge tag 'platform-drivers-x86-v5.3-2' of git://git.infradead.org/linux-platform-drivers-x86
Pull another x86 platform driver update from Andy Shevchenko:
"Provide better naming for ABI, i.e. tell that we have fan boost mode.
It won't break any ABI, but has to be done now to avoid confusion in
the future"
* tag 'platform-drivers-x86-v5.3-2' of git://git.infradead.org/linux-platform-drivers-x86:
platform/x86: asus: Rename "fan mode" to "fan boost mode"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/x86/asus-wmi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h index 8551156b8dca..4802cd2c7309 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -57,7 +57,7 @@ #define ASUS_WMI_DEVID_KBD_BACKLIGHT 0x00050021 #define ASUS_WMI_DEVID_LIGHT_SENSOR 0x00050022 /* ?? */ #define ASUS_WMI_DEVID_LIGHTBAR 0x00050025 -#define ASUS_WMI_DEVID_FAN_MODE 0x00110018 +#define ASUS_WMI_DEVID_FAN_BOOST_MODE 0x00110018 /* Misc */ #define ASUS_WMI_DEVID_CAMERA 0x00060013 |