diff --git a/[refs] b/[refs]
index d0e4b5ed4af5..0f91eb034a08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0aec66d493c1476daa88ec56b1076e51f1ceff0b
+refs/heads/master: 3a9f346a95d4faa05f4eca6470f971244073e18e
diff --git a/trunk/arch/arm/mach-msm/Kconfig b/trunk/arch/arm/mach-msm/Kconfig
index e73e9d17ca2e..69cc693aa51e 100644
--- a/trunk/arch/arm/mach-msm/Kconfig
+++ b/trunk/arch/arm/mach-msm/Kconfig
@@ -7,6 +7,7 @@ choice
 config ARCH_MSM7X00A
 	bool "MSM7x00A / MSM7x01A"
 	select ARCH_MSM_ARM11
+	select MSM_SMD
 	select MSM_SMD_PKG3
 	select CPU_V6
 
@@ -61,13 +62,6 @@ config MSM_SMD_PKG3
 	bool
 
 config MSM_SMD
-	default y
-	bool "MSM Shared Memory Driver (SMD)"
-	help
-	  Support for the shared memory interface between the apps
-	  processor and the baseband processor.  Provides access to
-	  the "shared heap", as well as virtual serial channels
-	  used to communicate with various services on the baseband
-	  processor.
+	bool
 
 endif