aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-02-13 16:29:01 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-02-13 23:21:07 -0500
commitd722260d233949ec531c684248a88cb163608851 (patch)
tree29d0080bd99d7650ada9769eeb657ceb019614e8
parent21fb9f0d5e91152066c9be801b44a7c592fd3fa2 (diff)
Input: add couple of missing GENERIC_HARDIRQS dependencies
When removing the !S390 dependency from drivers/input/Kconfig a couple of drivers don't compile because they have a dependency on GENERIC_HARDIRQS. So add the missing dependencies. Fixes e.g. this one: drivers/input/keyboard/lm8323.c: In function ‘lm8323_suspend’: drivers/input/keyboard/lm8323.c:801:2: error: implicit declaration of function ‘irq_set_irq_wake’ [-Werror=implicit-function-declaration] Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/Kconfig2
-rw-r--r--drivers/input/keyboard/Kconfig4
-rw-r--r--drivers/input/serio/Kconfig1
-rw-r--r--drivers/input/touchscreen/Kconfig2
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 55f7e57d4e42..38b523a1ece0 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -3,7 +3,7 @@
3# 3#
4 4
5menu "Input device support" 5menu "Input device support"
6 depends on !S390 && !UML 6 depends on !UML
7 7
8config INPUT 8config INPUT
9 tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT 9 tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 95b6d0335e8f..72377737eec8 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -224,7 +224,7 @@ config KEYBOARD_TCA6416
224 224
225config KEYBOARD_TCA8418 225config KEYBOARD_TCA8418
226 tristate "TCA8418 Keypad Support" 226 tristate "TCA8418 Keypad Support"
227 depends on I2C 227 depends on I2C && GENERIC_HARDIRQS
228 select INPUT_MATRIXKMAP 228 select INPUT_MATRIXKMAP
229 help 229 help
230 This driver implements basic keypad functionality 230 This driver implements basic keypad functionality
@@ -303,7 +303,7 @@ config KEYBOARD_HP7XX
303 303
304config KEYBOARD_LM8323 304config KEYBOARD_LM8323
305 tristate "LM8323 keypad chip" 305 tristate "LM8323 keypad chip"
306 depends on I2C 306 depends on I2C && GENERIC_HARDIRQS
307 depends on LEDS_CLASS 307 depends on LEDS_CLASS
308 help 308 help
309 If you say yes here you get support for the National Semiconductor 309 If you say yes here you get support for the National Semiconductor
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 4a4e182c33e7..560c243bfcaf 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -236,6 +236,7 @@ config SERIO_PS2MULT
236 236
237config SERIO_ARC_PS2 237config SERIO_ARC_PS2
238 tristate "ARC PS/2 support" 238 tristate "ARC PS/2 support"
239 depends on GENERIC_HARDIRQS
239 help 240 help
240 Say Y here if you have an ARC FPGA platform with a PS/2 241 Say Y here if you have an ARC FPGA platform with a PS/2
241 controller in it. 242 controller in it.
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index b93b5988ace8..9a647ee1136a 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -359,7 +359,7 @@ config TOUCHSCREEN_MCS5000
359 359
360config TOUCHSCREEN_MMS114 360config TOUCHSCREEN_MMS114
361 tristate "MELFAS MMS114 touchscreen" 361 tristate "MELFAS MMS114 touchscreen"
362 depends on I2C 362 depends on I2C && GENERIC_HARDIRQS
363 help 363 help
364 Say Y here if you have the MELFAS MMS114 touchscreen controller 364 Say Y here if you have the MELFAS MMS114 touchscreen controller
365 chip in your system. 365 chip in your system.