diff --git a/arch/arm/configs/hammerhead_defconfig b/arch/arm/configs/hammerhead_defconfig
index f8f8b4f94aefce1a52604789e341e7668ec066dd..463b6562e68633e04eb285bef361776c99a2ed39 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