Merge tag 'input-for-v6.3-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor...

[linux-block.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 6e51ebc55c4bca5b2e3cea88e74110f477102ebe..1d0c5f4c0f99e07711248bb2d28f9e0bd49521d7 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -550,15 +550,6 @@ config KEYBOARD_PXA27x
          To compile this driver as a module, choose M here: the
          module will be called pxa27x_keypad.
 
-config KEYBOARD_PXA930_ROTARY
-       tristate "PXA930/PXA935 Enhanced Rotary Controller Support"
-       depends on CPU_PXA930 || CPU_PXA935
-       help
-         Enable support for PXA930/PXA935 Enhanced Rotary Controller.
-
-         To compile this driver as a module, choose M here: the
-         module will be called pxa930_rotary.
-
 config KEYBOARD_PMIC8XXX
        tristate "Qualcomm PMIC8XXX keypad support"
        depends on MFD_PM8XXX
@@ -657,16 +648,6 @@ config KEYBOARD_SUN4I_LRADC
          To compile this driver as a module, choose M here: the
          module will be called sun4i-lradc-keys.
 
-config KEYBOARD_DAVINCI
-       tristate "TI DaVinci Key Scan"
-       depends on ARCH_DAVINCI_DM365
-       help
-         Say Y to enable keypad module support for the TI DaVinci
-         platforms (DM365).
-
-         To compile this driver as a module, choose M here: the
-         module will be called davinci_keyscan.
-
 config KEYBOARD_IPAQ_MICRO
        tristate "Buttons on Micro SoC (iPaq h3100,h3600,h3700)"
        depends on MFD_IPAQ_MICRO