diff options
| author | Dmitry Torokhov | 2014-05-15 01:49:19 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2014-05-15 01:49:19 +0200 |
| commit | 879f99ef2c4c05d9a7f0a67a05f1415663119825 (patch) | |
| tree | 0399664761f675eef741f8b08b92635069586151 /drivers/input/misc/Kconfig | |
| parent | Input: pmic8xxx-pwrkey - set sane default for debounce time (diff) | |
| parent | Linux 3.15-rc5 (diff) | |
| download | kernel-qcow2-linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.tar.gz kernel-qcow2-linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.tar.xz kernel-qcow2-linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.zip | |
Merge tag 'v3.15-rc5' into next
Merge with Linux 3.15-rc5 to sync up Wacom and other changes.
Diffstat (limited to 'drivers/input/misc/Kconfig')
| -rw-r--r-- | drivers/input/misc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 05ae7e7cddde..2ff4425a893b 100644 --- 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 @@ -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. |