Initial Contribution
msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index ce28bf6..9acebc0 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -321,6 +321,18 @@
help
Say Y here if you want to support gpio based keys, wheels etc...
+config INPUT_ISA1200_FF_MEMLESS
+ tristate "ISA1200 haptic ff-memless support"
+ depends on I2C
+ select INPUT_FF_MEMLESS
+ help
+ ISA1200 is a high performance enhanced haptic chip.
+ Say Y here if you want to support ISA1200 connected via I2C,
+ and select N if you are unsure.
+
+ To compile this driver as a module, choose M here: the
+ module will be called isa1200-ff-memless.
+
config HP_SDC_RTC
tristate "HP SDC Real Time Clock"
depends on (GSC || HP300) && SERIO
@@ -505,4 +517,43 @@
To compile this driver as a module, choose M here: the
module will be called xen-kbdfront.
+config PMIC8058_PWRKEY
+ tristate "PMIC8058 power key support"
+ default n
+ depends on PMIC8058
+ help
+ Say Y here if you want support for the PMIC8058 power key.
+
+ To compile this driver as a module, choose M here: the
+ module will be called pmic8058-pwrkey.
+
+config PMIC8058_OTHC
+ tristate "Qualcomm PMIC8058 OTHC support"
+ default n
+ depends on PMIC8058
+ help
+ Say Y here if you want support PMIC8058 OTHC.
+
+ To compile this driver as a module, choose M here: the
+ module will be called pmic8058-othc.
+
+config INPUT_PMIC8058_VIBRA_MEMLESS
+ tristate "Qualcomm PM8058 vibrator support (ff-memless)"
+ depends on PMIC8058 && INPUT_FF_MEMLESS
+ default n
+ help
+ This option enables device driver support for the vibrator
+ on Qualcomm PM8058 chip. This driver supports ff-memless interface
+ from input framework.
+
+ To compile this driver as module, choose M here: the
+ module will be called pmic8058-vib-memless.
+
+config BOSCH_BMA150
+ tristate "SMB380/BMA150 acceleration sensor support"
+ depends on I2C=y
+ help
+ If you say yes here you get support for Bosch Sensortec's
+ acceleration sensors SMB380/BMA150.
+
endif