diff options
author | Azael Avalos <coproscefalo@gmail.com> | 2014-08-14 11:55:40 -0400 |
---|---|---|
committer | Matthew Garrett <matthew.garrett@nebula.com> | 2014-08-16 04:23:56 -0400 |
commit | 186e4e89a0922d75fba476f15b723e541cc34bea (patch) | |
tree | fe7da9fbb67478a103614b3bac84f0af962b3a6f | |
parent | f369aa6d0571df12b6e80a1e86eb7d8ae715b421 (diff) |
platform/x86: Enable build support for toshiba_haps
Makefile and Kconfig build support patch for the newly introduced
kernel module toshiba_haps.
Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
-rw-r--r-- | drivers/platform/x86/Kconfig | 19 | ||||
-rw-r--r-- | drivers/platform/x86/Makefile | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 172f26ce59ac..3bbcbf12c1fb 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
@@ -652,6 +652,25 @@ config TOSHIBA_BT_RFKILL | |||
652 | If you have a modern Toshiba laptop with a Bluetooth and an | 652 | If you have a modern Toshiba laptop with a Bluetooth and an |
653 | RFKill switch (such as the Portege R500), say Y. | 653 | RFKill switch (such as the Portege R500), say Y. |
654 | 654 | ||
655 | config TOSHIBA_HAPS | ||
656 | tristate "Toshiba HDD Active Protection Sensor" | ||
657 | depends on ACPI | ||
658 | ---help--- | ||
659 | This driver adds support for the built-in accelerometer | ||
660 | found on recent Toshiba laptops equiped with HID TOS620A | ||
661 | device. | ||
662 | |||
663 | This driver receives ACPI notify events 0x80 when the sensor | ||
664 | detects a sudden move or a harsh vibration, as well as an | ||
665 | ACPI notify event 0x81 whenever the movement or vibration has | ||
666 | been stabilized. | ||
667 | |||
668 | Also provides sysfs entries to get/set the desired protection | ||
669 | level and reseting the HDD protection interface. | ||
670 | |||
671 | If you have a recent Toshiba laptop with a built-in accelerometer | ||
672 | device, say Y. | ||
673 | |||
655 | config ACPI_CMPC | 674 | config ACPI_CMPC |
656 | tristate "CMPC Laptop Extras" | 675 | tristate "CMPC Laptop Extras" |
657 | depends on X86 && ACPI | 676 | depends on X86 && ACPI |
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index c4ca428fd3db..f82232b1fc4d 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile | |||
@@ -38,6 +38,7 @@ obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o | |||
38 | obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o | 38 | obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o |
39 | 39 | ||
40 | obj-$(CONFIG_TOSHIBA_BT_RFKILL) += toshiba_bluetooth.o | 40 | obj-$(CONFIG_TOSHIBA_BT_RFKILL) += toshiba_bluetooth.o |
41 | obj-$(CONFIG_TOSHIBA_HAPS) += toshiba_haps.o | ||
41 | obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o | 42 | obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o |
42 | obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o | 43 | obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o |
43 | obj-$(CONFIG_INTEL_MFLD_THERMAL) += intel_mid_thermal.o | 44 | obj-$(CONFIG_INTEL_MFLD_THERMAL) += intel_mid_thermal.o |