diff --git a/[refs] b/[refs]
index ef27661fa48b..bbdae3d00417 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b67d5610879c8f1851a47fd5adfe7e924f3fe53
+refs/heads/master: 4a6692e2ac4c6b09235a9568468dd83a380c271d
diff --git a/trunk/drivers/ssbi/Kconfig b/trunk/drivers/ssbi/Kconfig
index b57c41bd0119..c7bc534ddf50 100644
--- a/trunk/drivers/ssbi/Kconfig
+++ b/trunk/drivers/ssbi/Kconfig
@@ -5,7 +5,7 @@
 menu "Qualcomm MSM SSBI bus support"
 
 config MSM_SSBI
-	bool "Qualcomm Single-wire Serial Bus Interface (SSBI)"
+	tristate "Qualcomm Single-wire Serial Bus Interface (SSBI)"
 	help
 	  If you say yes to this option, support will be included for the
 	  built-in SSBI interface on Qualcomm MSM family processors.
diff --git a/trunk/include/linux/msm_ssbi.h b/trunk/include/linux/msm_ssbi.h
index cfa47df6d003..0fe245bb2940 100644
--- a/trunk/include/linux/msm_ssbi.h
+++ b/trunk/include/linux/msm_ssbi.h
@@ -33,17 +33,6 @@ struct msm_ssbi_platform_data {
 	enum msm_ssbi_controller_type controller_type;
 };
 
-#ifdef CONFIG_MSM_SSBI
 int msm_ssbi_write(struct device *dev, u16 addr, u8 *buf, int len);
 int msm_ssbi_read(struct device *dev, u16 addr, u8 *buf, int len);
-#else
-static inline int msm_ssbi_write(struct device *dev, u16 addr, u8 *buf, int len)
-{
-	return -ENXIO;
-}
-static inline int msm_ssbi_read(struct device *dev, u16 addr, u8 *buf, int len)
-{
-	return -ENXIO;
-}
-#endif
 #endif