commit 485459d6f3d6936be9a4b4ff5739047b1a575bae
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 23 05:00:59 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 23 05:00:58 2013 -0700
tree cfd0eb141ed95cdc8a53257afae66f5a6c51a8c8
parent ad51d5a300ce43e8aeba92524ff2b7f2b06ea6b3
parent dd7ab2b2087c4fd7b44e7ffd91035b4976cebe57

Merge "msm: clock-8226/8610: Remove the XO parent for the q6ss_xo_clk"

arch/arm/mach-msm/clock-8226.c

diff --git a/arch/arm/mach-msm/clock-8226.c b/arch/arm/mach-msm/clock-8226.c
index 18c922d..6d76c41 100644
--- a/arch/arm/mach-msm/clock-8226.c
+++ b/arch/arm/mach-msm/clock-8226.c
@@ -2697,7 +2697,6 @@
 	.base = &virt_bases[LPASS_BASE],
 	.c = {
 		.dbg_name = "q6ss_xo_clk",
-		.parent = &xo.c,
 		.ops = &clk_ops_branch,
 		CLK_INIT(q6ss_xo_clk.c),
 	},

arch/arm/mach-msm/clock-8610.c

diff --git a/arch/arm/mach-msm/clock-8610.c b/arch/arm/mach-msm/clock-8610.c
index fae09d0..3cb3ea4 100644
--- a/arch/arm/mach-msm/clock-8610.c
+++ b/arch/arm/mach-msm/clock-8610.c
@@ -2245,7 +2245,6 @@
 	.bcr_reg = LPASS_Q6SS_BCR,
 	.base = &virt_bases[LPASS_BASE],
 	.c = {
-		.parent = &gcc_xo_clk_src.c,
 		.dbg_name = "q6ss_xo_clk",
 		.ops = &clk_ops_branch,
 		CLK_INIT(q6ss_xo_clk.c),