diff --git a/[refs] b/[refs]
index d7b8d51c8861..65f5dca66b2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9c8279b326e18bcb25ee9d12fe7513d24f8bbb1
+refs/heads/master: a8855e9c093fdb35b40a707d580c75d523fed16e
diff --git a/trunk/arch/arm/mach-msm/board-msm7x30.c b/trunk/arch/arm/mach-msm/board-msm7x30.c
index 74abb74b4983..76d5a22a6984 100644
--- a/trunk/arch/arm/mach-msm/board-msm7x30.c
+++ b/trunk/arch/arm/mach-msm/board-msm7x30.c
@@ -43,7 +43,7 @@ static struct platform_device *devices[] __initdata = {
 #if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER)
         &msm_device_uart2,
 #endif
-
+	&msm_device_smd,
 };
 
 static void __init msm7x30_init_irq(void)
diff --git a/trunk/arch/arm/mach-msm/devices-msm7x30.c b/trunk/arch/arm/mach-msm/devices-msm7x30.c
index b449e8ad2904..7fcf2e3b7698 100644
--- a/trunk/arch/arm/mach-msm/devices-msm7x30.c
+++ b/trunk/arch/arm/mach-msm/devices-msm7x30.c
@@ -51,6 +51,11 @@ struct platform_device msm_device_uart2 = {
 	.resource	= resources_uart2,
 };
 
+struct platform_device msm_device_smd = {
+	.name   = "msm_smd",
+	.id     = -1,
+};
+
 struct clk msm_clocks_7x30[] = {
 	CLK_PCOM("adm_clk",	ADM_CLK,	NULL, 0),
 	CLK_PCOM("adsp_clk",	ADSP_CLK,	NULL, 0),