commit 1cd1d697c8f568a75ca59dbe2818e940983ba049
author Linux Build Service Account <lnxbuild@localhost> Tue Aug 28 11:05:02 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Tue Aug 28 11:05:02 2012 -0700
tree b678083c6d562f70aef14838b499d60593b9e948
parent f371afecd969ef52bb6f06111e1234f3a5d26f12
parent aa2f66b2474ec0cd9402fc3220aaa6eac9552195

Merge "defconfig: msm8960: Enable IPC logging" into msm-3.4

arch/arm/configs/msm8960-perf_defconfig

diff --git a/arch/arm/configs/msm8960-perf_defconfig b/arch/arm/configs/msm8960-perf_defconfig
index 408175d..1ac8f02 100644
--- a/arch/arm/configs/msm8960-perf_defconfig
+++ b/arch/arm/configs/msm8960-perf_defconfig
@@ -293,6 +293,7 @@
 CONFIG_STM_LIS3DH=y
 CONFIG_INPUT_MPU3050=y
 # CONFIG_LEGACY_PTYS is not set
+CONFIG_MSM_IPC_LOGGING=y
 CONFIG_N_SMUX=y
 CONFIG_N_SMUX_LOOPBACK=y
 CONFIG_SMUX_CTL=y

arch/arm/configs/msm8960_defconfig

diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index 7a4bf08..8ac8f1a 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -297,6 +297,7 @@
 CONFIG_STM_LIS3DH=y
 CONFIG_INPUT_MPU3050=y
 # CONFIG_LEGACY_PTYS is not set
+CONFIG_MSM_IPC_LOGGING=y
 CONFIG_N_SMUX=y
 CONFIG_N_SMUX_LOOPBACK=y
 CONFIG_SMUX_CTL=y