commit 0afb2516189080ed9d52f2c5fbf7131d5dc2387b
author Linux Build Service Account <lnxbuild@localhost> Thu Jul 19 09:36:43 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Thu Jul 19 09:36:43 2012 -0700
tree da370e3542258fbd759fd84f36e6914affe53b31
parent 8fde9052266a4108e4cf093ae101f022a13471d1
parent 6f8781bc42157a39689a6f4819b13062db83ccdb

Merge "defconfig: Enable support for tricolor leds for 8x25" into msm-3.4

arch/arm/configs/msm7627a-perf_defconfig

diff --git a/arch/arm/configs/msm7627a-perf_defconfig b/arch/arm/configs/msm7627a-perf_defconfig
index c40d4d0..a8abb30 100644
--- a/arch/arm/configs/msm7627a-perf_defconfig
+++ b/arch/arm/configs/msm7627a-perf_defconfig
@@ -312,6 +312,7 @@
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_MSM_PDM=y
 CONFIG_LEDS_PMIC_MPP=y
+CONFIG_LEDS_MSM_TRICOLOR=y
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
 CONFIG_RTC_CLASS=y

arch/arm/configs/msm7627a_defconfig

diff --git a/arch/arm/configs/msm7627a_defconfig b/arch/arm/configs/msm7627a_defconfig
index 838933c..314f91b 100644
--- a/arch/arm/configs/msm7627a_defconfig
+++ b/arch/arm/configs/msm7627a_defconfig
@@ -312,6 +312,7 @@
 CONFIG_MMC_MSM_SDC3_8_BIT_SUPPORT=y
 CONFIG_LEDS_MSM_PDM=y
 CONFIG_LEDS_PMIC_MPP=y
+CONFIG_LEDS_MSM_TRICOLOR=y
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
 CONFIG_RTC_CLASS=y