summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorPeer Chen <pchen@nvidia.com>2011-08-03 04:38:25 -0400
committerVarun Colbert <vcolbert@nvidia.com>2011-08-03 15:04:34 -0700
commit273978037301e4732d18841610b28918f77213fc (patch)
tree9de1a3b7d368f829ee5384ad358795d1f7fb037a /arch/arm/configs
parent7ead8fdb4882176414a87299e037968bc7de7ace (diff)
arm: config: cardhu: Enabling onkey resume
Enabling onkey as the wakeup source. Removing the WAKELOCK support for LDK. bug 857634 Change-Id: I98091a2e38b3f3fb8ffea15f30f70017b5698715 Signed-off-by: Peer Chen <pchen@nvidia.com> Reviewed-on: http://git-master/r/44710 Reviewed-by: Allen R Martin <amartin@nvidia.com> Reviewed-by: Winnie Hsu <whsu@nvidia.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/tegra_cardhu_gnu_linux_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/tegra_cardhu_gnu_linux_defconfig b/arch/arm/configs/tegra_cardhu_gnu_linux_defconfig
index 5a1aef375681..aaef42acabae 100644
--- a/arch/arm/configs/tegra_cardhu_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_cardhu_gnu_linux_defconfig
@@ -52,7 +52,7 @@ CONFIG_CPU_IDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_PM=y
-CONFIG_WAKELOCK=y
+# CONFIG_WAKELOCK is not set
CONFIG_PM_RUNTIME=y
CONFIG_NET=y
CONFIG_PACKET=y
@@ -105,6 +105,7 @@ CONFIG_USB_USBNET=y
# CONFIG_USB_NET_ZAURUS is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_INTERRUPT=y
CONFIG_KEYBOARD_TEGRA=y
# CONFIG_INPUT_MOUSE is not set
# CONFIG_SERIO is not set