Merge tag 'v3.12-rc4' into next
Merge with mainline to bring in changes to input subsystem that were committed through other trees.
This commit is contained in:
@@ -224,7 +224,7 @@ config KEYBOARD_TCA6416
|
||||
|
||||
config KEYBOARD_TCA8418
|
||||
tristate "TCA8418 Keypad Support"
|
||||
depends on I2C && GENERIC_HARDIRQS
|
||||
depends on I2C
|
||||
select INPUT_MATRIXKMAP
|
||||
help
|
||||
This driver implements basic keypad functionality
|
||||
@@ -303,7 +303,7 @@ config KEYBOARD_HP7XX
|
||||
|
||||
config KEYBOARD_LM8323
|
||||
tristate "LM8323 keypad chip"
|
||||
depends on I2C && GENERIC_HARDIRQS
|
||||
depends on I2C
|
||||
depends on LEDS_CLASS
|
||||
help
|
||||
If you say yes here you get support for the National Semiconductor
|
||||
|
||||
Reference in New Issue
Block a user