diff options
author | Dmitry Torokhov | 2017-02-21 00:16:02 +0100 |
---|---|---|
committer | Dmitry Torokhov | 2017-02-21 00:16:02 +0100 |
commit | 6e11617fcff3688f70650a3e40addb0043dda137 (patch) | |
tree | a24f378c1a1e9f627ca1076a8b5bbd2ad7422630 /drivers/input/misc/Kconfig | |
parent | Input: elan_i2c - add ELAN0605 to the ACPI table (diff) | |
parent | Input: zet6223 - export OF device ID as module aliases (diff) | |
download | kernel-qcow2-linux-6e11617fcff3688f70650a3e40addb0043dda137.tar.gz kernel-qcow2-linux-6e11617fcff3688f70650a3e40addb0043dda137.tar.xz kernel-qcow2-linux-6e11617fcff3688f70650a3e40addb0043dda137.zip |
Merge branch 'next' into for-linus
Prepare input updates for 4.11 merge window.
Diffstat (limited to 'drivers/input/misc/Kconfig')
-rw-r--r-- | drivers/input/misc/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 1ae4d9617ff8..5b6c52210d20 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -234,16 +234,6 @@ config INPUT_MMA8450 To compile this driver as a module, choose M here: the module will be called mma8450. -config INPUT_MPU3050 - tristate "MPU3050 Triaxial gyroscope sensor" - depends on I2C - help - Say Y here if you want to support InvenSense MPU3050 - connected via an I2C bus. - - To compile this driver as a module, choose M here: the - module will be called mpu3050. - config INPUT_APANEL tristate "Fujitsu Lifebook Application Panel buttons" depends on X86 && I2C && LEDS_CLASS |