summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorNitin Garg <nitin.garg@freescale.com>2012-12-12 12:45:37 -0600
committerNitin Garg <nitin.garg@freescale.com>2012-12-12 12:46:33 -0600
commita82351bf1ad88636f0850fae63995a77004fd832 (patch)
tree42f65fbcd822edf9d2c6248485771f2409f5981c /arch
parent78016a947d71c0f973c7070f8b44b6d65fb9602a (diff)
ENGR00236827-1: Enable MPR121 capacitive button driver in imx5 android config
Enable MPR121 capacitive button driver in imx5 android config. Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/imx5_android_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/imx5_android_defconfig b/arch/arm/configs/imx5_android_defconfig
index 2974b2b711cb..f74b706fce0f 100644
--- a/arch/arm/configs/imx5_android_defconfig
+++ b/arch/arm/configs/imx5_android_defconfig
@@ -1278,6 +1278,7 @@ CONFIG_KEYBOARD_GPIO=y
# CONFIG_KEYBOARD_LM8323 is not set
# CONFIG_KEYBOARD_MAX7359 is not set
# CONFIG_KEYBOARD_MCS is not set
+CONFIG_KEYBOARD_MPR121=y
# CONFIG_KEYBOARD_IMX is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_OPENCORES is not set