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/mach-msm/Kconfig

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 653da93..dc2facd 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -478,6 +478,12 @@
 	help
 	  Support for the Qualcomm MSM8960 FLUID device.
 
+config MACH_MSM8960_LIQUID
+	depends on ARCH_MSM8960
+	bool "MSM8960 LIQUID"
+	help
+	  Support for the Qualcomm MSM8960 LIQUID device.
+
 config MSM_USE_TSIF1
 	depends on ARCH_MSM8X60
 	bool "MSM8x60 use TSIF1"