diff options
author | Patrick Tjin <pattjin@google.com> | 2014-10-20 12:45:36 -0700 |
---|---|---|
committer | Pat Tjin <pattjin@google.com> | 2014-10-20 19:47:00 +0000 |
commit | 88fbc66717d700d44a0ed5d76a5d2666e80fdd3c (patch) | |
tree | 551b53ebd6b4671e62646f7313a33846b20bb4d0 | |
parent | cd2743bb4905f0b9d11c13eee3c763249aada01c (diff) |
Revert "Revert "Revert "hammerhead: Enable /dev/diag"""android-5.0.1_r0.6android-5.0.0_r0.5
Bug: 12134070
This reverts commit 56a0a3a049bef3ad23ecaf0c80ae95f36d7bd6be.
-rw-r--r-- | arch/arm/configs/hammerhead_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/hammerhead_defconfig b/arch/arm/configs/hammerhead_defconfig index f8f8b4f94aef..463b6562e686 100644 --- a/arch/arm/configs/hammerhead_defconfig +++ b/arch/arm/configs/hammerhead_defconfig @@ -349,6 +349,8 @@ CONFIG_INPUT_UINPUT=y CONFIG_SERIAL_MSM_HS=y CONFIG_SERIAL_MSM_HSL=y CONFIG_SERIAL_MSM_HSL_CONSOLE=y +# CONFIG_DIAG_CHAR is not set +# CONFIG_DIAG_OVER_USB is not set CONFIG_HW_RANDOM_MSM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y |