diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-02 18:35:17 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-02 18:35:17 -0700 |
| commit | d01d0756f75e7a5b4b43764ad45b83c4340f11d6 (patch) | |
| tree | 90db2ff7ccb35a8fdcf98366e6404afe1f845bc4 /drivers/input/misc/Kconfig | |
| parent | b326b853dca2f410b254198ee89abad71a2f4668 (diff) | |
| parent | 0d87c7228a49e8342d60dd552892e470e0b291fa (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/misc/Kconfig')
| -rw-r--r-- | drivers/input/misc/Kconfig | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index c44b9eafc55..b49e2337972 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -327,6 +327,17 @@ config INPUT_PCF8574 To compile this driver as a module, choose M here: the module will be called pcf8574_keypad. +config INPUT_PWM_BEEPER + tristate "PWM beeper support" + depends on HAVE_PWM + help + Say Y here to get support for PWM based beeper devices. + + If unsure, say N. + + To compile this driver as a module, choose M here: the module will be + called pwm-beeper. + config INPUT_GPIO_ROTARY_ENCODER tristate "Rotary encoders connected to GPIO pins" depends on GPIOLIB && GENERIC_GPIO @@ -390,4 +401,41 @@ config INPUT_PCAP To compile this driver as a module, choose M here: the module will be called pcap_keys. +config INPUT_ADXL34X + tristate "Analog Devices ADXL34x Three-Axis Digital Accelerometer" + default n + help + Say Y here if you have a Accelerometer interface using the + ADXL345/6 controller, and your board-specific initialization + code includes that in its table of devices. + + This driver can use either I2C or SPI communication to the + ADXL345/6 controller. Select the appropriate method for + your system. + + If unsure, say N (but it's safe to say "Y"). + + To compile this driver as a module, choose M here: the + module will be called adxl34x. + +config INPUT_ADXL34X_I2C + tristate "support I2C bus connection" + depends on INPUT_ADXL34X && I2C + default y + help + Say Y here if you have ADXL345/6 hooked to an I2C bus. + + To compile this driver as a module, choose M here: the + module will be called adxl34x-i2c. + +config INPUT_ADXL34X_SPI + tristate "support SPI bus connection" + depends on INPUT_ADXL34X && SPI + default y + help + Say Y here if you have ADXL345/6 hooked to a SPI bus. + + To compile this driver as a module, choose M here: the + module will be called adxl34x-spi. + endif |