From 9d763a823a4c5fd3029f649d454838d12814374f Mon Sep 17 00:00:00 2001
From: Seungwhan Youn <sw.youn@samsung.com>
Date: Tue, 19 Oct 2010 18:13:11 +0900
Subject: [PATCH] --- yaml --- r: 221179 b: refs/heads/master c:
 b05d85350cce3f7da40cefd29305571f6230fbf7 h: refs/heads/master i:   221177:
 af3946f71da9b8625497d0839ca70f8e903a19f4   221175:
 5d2637e95d2e9ed0f1984cb8e53535387fa5f548 v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/arm/mach-s5p64x0/clock-s5p6440.c | 12 ++++++------
 trunk/arch/arm/mach-s5p64x0/clock-s5p6450.c | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 32791be31756..300035a27cd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 313068fd3c23f5a6126e8dc8add84c018473e5ce
+refs/heads/master: b05d85350cce3f7da40cefd29305571f6230fbf7
diff --git a/trunk/arch/arm/mach-s5p64x0/clock-s5p6440.c b/trunk/arch/arm/mach-s5p64x0/clock-s5p6440.c
index 0d728d3383b4..e4883dc1c8d7 100644
--- a/trunk/arch/arm/mach-s5p64x0/clock-s5p6440.c
+++ b/trunk/arch/arm/mach-s5p64x0/clock-s5p6440.c
@@ -152,6 +152,12 @@ static struct clk init_clocks_disable[] = {
 		.parent		= &clk_hclk.clk,
 		.enable		= s5p64x0_hclk0_ctrl,
 		.ctrlbit	= (1 << 8),
+	}, {
+		.name		= "pdma",
+		.id		= -1,
+		.parent		= &clk_hclk_low.clk,
+		.enable		= s5p64x0_hclk0_ctrl,
+		.ctrlbit	= (1 << 12),
 	}, {
 		.name		= "hsmmc",
 		.id		= 0,
@@ -333,12 +339,6 @@ static struct clk init_clocks[] = {
 		.parent		= &clk_hclk.clk,
 		.enable		= s5p64x0_hclk0_ctrl,
 		.ctrlbit	= (1 << 21),
-	}, {
-		.name		= "dma",
-		.id		= -1,
-		.parent		= &clk_hclk_low.clk,
-		.enable		= s5p64x0_hclk0_ctrl,
-		.ctrlbit	= (1 << 12),
 	}, {
 		.name		= "uart",
 		.id		= 0,
diff --git a/trunk/arch/arm/mach-s5p64x0/clock-s5p6450.c b/trunk/arch/arm/mach-s5p64x0/clock-s5p6450.c
index 1b9b0f92d178..7dbf3c968f53 100644
--- a/trunk/arch/arm/mach-s5p64x0/clock-s5p6450.c
+++ b/trunk/arch/arm/mach-s5p64x0/clock-s5p6450.c
@@ -188,6 +188,12 @@ static struct clk init_clocks_disable[] = {
 		.parent		= &clk_hclk_low.clk,
 		.enable		= s5p64x0_hclk0_ctrl,
 		.ctrlbit	= (1 << 3),
+	}, {
+		.name		= "pdma",
+		.id		= -1,
+		.parent		= &clk_hclk_low.clk,
+		.enable		= s5p64x0_hclk0_ctrl,
+		.ctrlbit	= (1 << 12),
 	}, {
 		.name		= "hsmmc",
 		.id		= 0,
@@ -285,12 +291,6 @@ static struct clk init_clocks[] = {
 		.parent		= &clk_hclk.clk,
 		.enable		= s5p64x0_hclk0_ctrl,
 		.ctrlbit	= (1 << 21),
-	}, {
-		.name		= "dma",
-		.id		= -1,
-		.parent		= &clk_hclk_low.clk,
-		.enable		= s5p64x0_hclk0_ctrl,
-		.ctrlbit	= (1 << 12),
 	}, {
 		.name		= "uart",
 		.id		= 0,