commit 0d1f8ae690767d07f08e6f21d5fdba3d5b4aa852
author Amir Samuelov <amirs@codeaurora.org> Thu Jul 28 11:13:58 2011 +0300
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 10:27:50 2011 -0700
tree 4a5d8c41022819f224fc9647d9604179553d2511
parent 5bb7ece4d4b02ca96330571837117f5e61e52096

msm: 8960: Add LiQUID machine support

Signed-off-by: Amir Samuelov <amirs@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/Kconfig

arch/arm/configs/msm8960_defconfig

diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index 1bfd83d..fddd877 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -38,6 +38,7 @@
 CONFIG_MACH_MSM8960_CDP=y
 CONFIG_MACH_MSM8960_MTP=y
 CONFIG_MACH_MSM8960_FLUID=y
+CONFIG_MACH_MSM8960_LIQUID=y
 # CONFIG_MSM_STACKED_MEMORY is not set
 CONFIG_KERNEL_PMEM_EBI_REGION=y
 # CONFIG_MSM_JTAG_V7 is not set