Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[cascardo/linux.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 9752761..68f3d2b 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -614,6 +614,7 @@ config ACPI_TOSHIBA
        depends on INPUT
        depends on RFKILL || RFKILL = n
        depends on SERIO_I8042 || SERIO_I8042 = n
        depends on INPUT
        depends on RFKILL || RFKILL = n
        depends on SERIO_I8042 || SERIO_I8042 = n

+       depends on ACPI_VIDEO || ACPI_VIDEO = n

        select INPUT_POLLDEV
        select INPUT_SPARSEKMAP
        ---help---
        select INPUT_POLLDEV
        select INPUT_SPARSEKMAP
        ---help---


@@ -659,7 +660,7 @@ config TOSHIBA_HAPS
        depends on ACPI
        ---help---
          This driver adds support for the built-in accelerometer
        depends on ACPI
        ---help---
          This driver adds support for the built-in accelerometer

-         found on recent Toshiba laptops equiped with HID TOS620A
+         found on recent Toshiba laptops equipped with HID TOS620A

          device.
 
          This driver receives ACPI notify events 0x80 when the sensor
          device.
 
          This driver receives ACPI notify events 0x80 when the sensor


@@ -668,7 +669,7 @@ config TOSHIBA_HAPS
          been stabilized.
 
          Also provides sysfs entries to get/set the desired protection
          been stabilized.
 
          Also provides sysfs entries to get/set the desired protection

-         level and reseting the HDD protection interface.
+         level and resetting the HDD protection interface.

 
          If you have a recent Toshiba laptop with a built-in accelerometer
          device, say Y.
 
          If you have a recent Toshiba laptop with a built-in accelerometer
          device, say Y.