commit 5d49cec96a75412a1a314bea5e215997e5cbb64a
author Siddartha Mohanadoss <smohanad@codeaurora.org> Wed Sep 21 10:26:15 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Tue Oct 04 17:13:37 2011 -0700
tree 8992f7e66b31691996f1949780e1bceeafd63d23
parent dc60f125b9d3143c8441a99e09e7285b2406d141

platform-drivers: msm: tsens: Add TSENS support for MDM9x15

Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/board-9615.c
	arch/arm/mach-msm/devices-9615.c

arch/arm/mach-msm/devices.h

diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
index 1ab614c..b4697ce 100644
--- a/arch/arm/mach-msm/devices.h
+++ b/arch/arm/mach-msm/devices.h
@@ -71,6 +71,7 @@
 extern struct platform_device msm9615_device_qup_i2c_gsbi5;
 extern struct platform_device msm9615_device_qup_spi_gsbi3;
 extern struct platform_device msm9615_device_ssbi_pmic1;
+extern struct platform_device msm9615_device_tsens;
 
 extern struct platform_device msm_device_sdc1;
 extern struct platform_device msm_device_sdc2;