From 68d55230cb153abfbf869ecbcdbce359861e2778 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 12 Jan 2012 10:41:35 +0900
Subject: [PATCH] --- yaml --- r: 295855 b: refs/heads/master c:
 ed8d8aa1e674b5b03fceae56a81cccbcf60ec95e h: refs/heads/master i:   295853:
 93552f66a2435bbcaeafecb85acfa5de63d0083d   295851:
 754c0c18e1c74e6ab645ecabaa40b2e4f620f7df   295847:
 767750708545c153b82f2d95f8926bde11162073   295839:
 387ed7cafb7df6f3b9d47648c910ae6f5adc5075 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arm/mach-s3c64xx/clock.c | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index eda5dacac199..b2d0e7ebec74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2abf13c9ffdcde537fc54b83f1bcd50cc758beca
+refs/heads/master: ed8d8aa1e674b5b03fceae56a81cccbcf60ec95e
diff --git a/trunk/arch/arm/mach-s3c64xx/clock.c b/trunk/arch/arm/mach-s3c64xx/clock.c
index 31bb27dc4aeb..b58274f80cf9 100644
--- a/trunk/arch/arm/mach-s3c64xx/clock.c
+++ b/trunk/arch/arm/mach-s3c64xx/clock.c
@@ -201,6 +201,15 @@ static struct clk init_clocks_off[] = {
 		.parent		= &clk_48m,
 		.enable		= s3c64xx_sclk_ctrl,
 		.ctrlbit	= S3C_CLKCON_SCLK_MMC2_48,
+	}, {
+		.name		= "ac97",
+		.parent		= &clk_p,
+		.ctrlbit	= S3C_CLKCON_PCLK_AC97,
+	}, {
+		.name		= "cfcon",
+		.parent		= &clk_h,
+		.enable		= s3c64xx_hclk_ctrl,
+		.ctrlbit	= S3C_CLKCON_HCLK_IHOST,
 	}, {
 		.name		= "dma0",
 		.parent		= &clk_h,
@@ -284,16 +293,7 @@ static struct clk init_clocks[] = {
 		.name		= "watchdog",
 		.parent		= &clk_p,
 		.ctrlbit	= S3C_CLKCON_PCLK_WDT,
-	}, {
-		.name		= "ac97",
-		.parent		= &clk_p,
-		.ctrlbit	= S3C_CLKCON_PCLK_AC97,
-	}, {
-		.name		= "cfcon",
-		.parent		= &clk_h,
-		.enable		= s3c64xx_hclk_ctrl,
-		.ctrlbit	= S3C_CLKCON_HCLK_IHOST,
-	}
+	},
 };
 
 static struct clk clk_hsmmc0 = {