Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9453203b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.6-3' of... 

Merge tag 'platform-drivers-x86-v4.6-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fix from Darren Hart:
 "Fix regression caused by hotkey enabling value in toshiba_acpi"

* tag 'platform-drivers-x86-v4.6-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  toshiba_acpi: Fix regression caused by hotkey enabling value
parents f28f20da a30b8f81

drivers/platform/x86/toshiba_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ MODULE_LICENSE("GPL"); 
/* Field definitions */

#define HCI_ACCEL_MASK			0x7fff

#define HCI_HOTKEY_DISABLE		0x0b

#define HCI_HOTKEY_ENABLE		0x01

#define HCI_HOTKEY_ENABLE		0x09

#define HCI_HOTKEY_SPECIAL_FUNCTIONS	0x10

#define HCI_LCD_BRIGHTNESS_BITS		3

#define HCI_LCD_BRIGHTNESS_SHIFT	(16-HCI_LCD_BRIGHTNESS_BITS)