From 7f196953c6bfc93e57e753e182b39a50ef8f2cfc Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 13 Feb 2013 13:29:01 -0800 Subject: [PATCH] --- yaml --- r: 350692 b: refs/heads/master c: d722260d233949ec531c684248a88cb163608851 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/Kconfig | 2 +- trunk/drivers/input/keyboard/Kconfig | 4 ++-- trunk/drivers/input/serio/Kconfig | 1 + trunk/drivers/input/touchscreen/Kconfig | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 45cf03664ad8..8ad84b6110c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21fb9f0d5e91152066c9be801b44a7c592fd3fa2 +refs/heads/master: d722260d233949ec531c684248a88cb163608851 diff --git a/trunk/drivers/input/Kconfig b/trunk/drivers/input/Kconfig index 55f7e57d4e42..38b523a1ece0 100644 --- a/trunk/drivers/input/Kconfig +++ b/trunk/drivers/input/Kconfig @@ -3,7 +3,7 @@ # menu "Input device support" - depends on !S390 && !UML + depends on !UML config INPUT tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT diff --git a/trunk/drivers/input/keyboard/Kconfig b/trunk/drivers/input/keyboard/Kconfig index 95b6d0335e8f..72377737eec8 100644 --- a/trunk/drivers/input/keyboard/Kconfig +++ b/trunk/drivers/input/keyboard/Kconfig @@ -224,7 +224,7 @@ config KEYBOARD_TCA6416 config KEYBOARD_TCA8418 tristate "TCA8418 Keypad Support" - depends on I2C + depends on I2C && GENERIC_HARDIRQS 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 + depends on I2C && GENERIC_HARDIRQS depends on LEDS_CLASS help If you say yes here you get support for the National Semiconductor diff --git a/trunk/drivers/input/serio/Kconfig b/trunk/drivers/input/serio/Kconfig index 4a4e182c33e7..560c243bfcaf 100644 --- a/trunk/drivers/input/serio/Kconfig +++ b/trunk/drivers/input/serio/Kconfig @@ -236,6 +236,7 @@ config SERIO_PS2MULT config SERIO_ARC_PS2 tristate "ARC PS/2 support" + depends on GENERIC_HARDIRQS help Say Y here if you have an ARC FPGA platform with a PS/2 controller in it. diff --git a/trunk/drivers/input/touchscreen/Kconfig b/trunk/drivers/input/touchscreen/Kconfig index b93b5988ace8..9a647ee1136a 100644 --- a/trunk/drivers/input/touchscreen/Kconfig +++ b/trunk/drivers/input/touchscreen/Kconfig @@ -359,7 +359,7 @@ config TOUCHSCREEN_MCS5000 config TOUCHSCREEN_MMS114 tristate "MELFAS MMS114 touchscreen" - depends on I2C + depends on I2C && GENERIC_HARDIRQS help Say Y here if you have the MELFAS MMS114 touchscreen controller chip in your system.