commit | 3593d30d0b6fdff42a40bb44df0e3306dd820db2 | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Thu Mar 07 01:35:23 2013 -0800 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Thu Mar 07 01:35:22 2013 -0800 |
tree | 5f56356c9b5b1d9366ed8a158ffbc1b67b4ffc6d | |
parent | 5df9bae270b1a57f9c392961e3cdf49af80a45c8 [diff] | |
parent | 79dc06aa51fb095c6b4fff8679b24092982af309 [diff] |
Merge "configs: msm8610_defconfig: Enable power key"
diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig index 3d710cc..e6f4396 100644 --- a/arch/arm/configs/msm8610_defconfig +++ b/arch/arm/configs/msm8610_defconfig
@@ -220,6 +220,7 @@ CONFIG_CRYPTO_TWOFISH=y # CONFIG_CRYPTO_HW is not set CONFIG_CRC_CCITT=y +CONFIG_QPNP_POWER_ON=y CONFIG_LIBCRC32C=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y