aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-06-28 22:30:56 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-06-28 23:57:44 -0700
commit00b8ac409cad653137f087e3ff69c020174cbc15 (patch)
tree1408412941a609e92010f1614465eaad52fd908c /drivers/mfd
parentc413ec446188ae53276eb60a60311b430448c6b0 (diff)
downloadkernel_samsung_aries-00b8ac409cad653137f087e3ff69c020174cbc15.zip
kernel_samsung_aries-00b8ac409cad653137f087e3ff69c020174cbc15.tar.gz
kernel_samsung_aries-00b8ac409cad653137f087e3ff69c020174cbc15.tar.bz2
Input: dm355evm_keys - fix kconfig symbol names
The keypad driver for the DM355 EVM got slightly broken as it merged, since it moved from input/keyboard to input/misc and its Kconfig symbol changed. This patch copes with the changed Kconfig symbol. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/dm355evm_msp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
index 7ac12cb..5b6e58a 100644
--- a/drivers/mfd/dm355evm_msp.c
+++ b/drivers/mfd/dm355evm_msp.c
@@ -32,8 +32,7 @@
* This driver was tested with firmware revision A4.
*/
-#if defined(CONFIG_KEYBOARD_DM355EVM) \
- || defined(CONFIG_KEYBOARD_DM355EVM_MODULE)
+#if defined(CONFIG_INPUT_DM355EVM) || defined(CONFIG_INPUT_DM355EVM_MODULE)
#define msp_has_keyboard() true
#else
#define msp_has_keyboard() false