From 4fbb7463f7fb9d1b9b4b5f4997412a289b5a76a0 Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Wed, 28 Apr 2010 10:48:24 -0400
Subject: [PATCH] --- yaml --- r: 191894 b: refs/heads/master c:
 e598863690d956ad4e18904bb5b6c63fea1ad255 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/mach-mmp/mmp2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b8558a81f0b4..f659b00ba5f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f97cab28b1895ecb0aa317cc785bb209f57fc1e8
+refs/heads/master: e598863690d956ad4e18904bb5b6c63fea1ad255
diff --git a/trunk/arch/arm/mach-mmp/mmp2.c b/trunk/arch/arm/mach-mmp/mmp2.c
index 72eb9daeea99..cca39929110f 100644
--- a/trunk/arch/arm/mach-mmp/mmp2.c
+++ b/trunk/arch/arm/mach-mmp/mmp2.c
@@ -101,7 +101,7 @@ static int __init mmp2_init(void)
 	if (cpu_is_mmp2()) {
 		mfp_init_base(MFPR_VIRT_BASE);
 		mfp_init_addr(mmp2_addr_map);
-		clks_register(ARRAY_AND_SIZE(mmp2_clkregs));
+		clkdev_add_table(ARRAY_AND_SIZE(mmp2_clkregs));
 	}
 
 	return 0;