Merge branches 'clks' and 'pnx' into devel

2010-02-25 22:10:38 +00:00
parent 2741ecb4ce eed18b5fa4
commit 9f33be2c3a
146 changed files with 1477 additions and 1167 deletions
--- a/arch/arm/mach-w90x900/cpu.c
+++ b/arch/arm/mach-w90x900/cpu.c
@@ -219,6 +219,6 @@ void __init nuc900_map_io(struct map_desc *mach_desc, int mach_size)

 void __init nuc900_init_clocks(void)
 {
-	clks_register(nuc900_clkregs, ARRAY_SIZE(nuc900_clkregs));
+	clkdev_add_table(nuc900_clkregs, ARRAY_SIZE(nuc900_clkregs));
 }