Merge tag 'pwm/for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[cascardo/linux.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 7904ab0..5928ea7 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -156,7 +156,7 @@ config INPUT_MAX8925_ONKEY
 
 config INPUT_MAX8997_HAPTIC
        tristate "MAXIM MAX8997 haptic controller support"
-       depends on PWM && HAVE_PWM && MFD_MAX8997
+       depends on PWM && MFD_MAX8997
        select INPUT_FF_MEMLESS
        help
          This option enables device driver support for the haptic controller
@@ -269,7 +269,7 @@ config INPUT_COBALT_BTNS
 
 config INPUT_WISTRON_BTNS
        tristate "x86 Wistron laptop button interface"
-       depends on X86 && !X86_64
+       depends on X86_32
        select INPUT_POLLDEV
        select INPUT_SPARSEKMAP
        select NEW_LEDS
@@ -470,7 +470,7 @@ config INPUT_PCF8574
 
 config INPUT_PWM_BEEPER
        tristate "PWM beeper support"
-       depends on PWM && HAVE_PWM
+       depends on PWM
        help
          Say Y here to get support for PWM based beeper devices.
 
@@ -666,4 +666,14 @@ config INPUT_IDEAPAD_SLIDEBAR
          To compile this driver as a module, choose M here: the
          module will be called ideapad_slidebar.
 
+config INPUT_SOC_BUTTON_ARRAY
+       tristate "Windows-compatible SoC Button Array"
+       depends on KEYBOARD_GPIO
+       help
+         Say Y here if you have a SoC-based tablet that originally
+         runs Windows 8.
+
+         To compile this driver as a module, choose M here: the
+         module will be called soc_button_array.
+
 endif