commit d92e346c9a76a99ca6670007c2ca97b8e99c4821
author Linux Build Service Account <lnxbuild@localhost> Wed Nov 09 05:50:49 2011 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Wed Nov 09 05:50:49 2011 -0800
tree b16145515a4371421e98a637d3b80585b9a50ad7
parent ff1fa7728d7db3b9aa34df53aa7c53f6406a9d63
parent 0b10fa1c0f2adba876126996affe20becf07421e

Merge "msm: 9615: Change SDC2 DAT1 GPIO line suspend config" into msm-3.0

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

diff --git a/arch/arm/mach-msm/board-9615.c b/arch/arm/mach-msm/board-9615.c
index 755132b..25eafb8 100644
--- a/arch/arm/mach-msm/board-9615.c
+++ b/arch/arm/mach-msm/board-9615.c
@@ -419,7 +419,7 @@
 		.gpio      = 26,
 		.settings = {
 			[GPIOMUX_ACTIVE]    = &sdcc2_cmd_data_0_3_actv_cfg,
-			[GPIOMUX_SUSPENDED] = &sdcc2_suspend_cfg,
+			[GPIOMUX_SUSPENDED] = &sdcc2_cmd_data_0_3_actv_cfg,
 		},
 	},
 	{
@@ -439,7 +439,7 @@
 		},
 	},
 	{
-		/* SDC2_CMD GSBI1 */
+		/* SDC2_CMD */
 		.gpio      = 29,
 		.settings = {
 			[GPIOMUX_ACTIVE]    = &sdcc2_cmd_data_0_3_actv_cfg,
@@ -447,7 +447,7 @@
 		},
 	},
 	{
-		/* SDC2_CLK GSBI1 */
+		/* SDC2_CLK */
 		.gpio      = 30,
 		.settings = {
 			[GPIOMUX_ACTIVE]    = &sdcc2_clk_actv_cfg,