Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel

[safe/jmp/linux-2.6] / arch / arm / plat-s3c / clock.c

diff --git a/arch/arm/plat-s3c/clock.c b/arch/arm/plat-s3c/clock.c
index da7ac07..4d01ef1 100644 (file)
--- a/arch/arm/plat-s3c/clock.c
+++ b/arch/arm/plat-s3c/clock.c
@@ -38,7 +38,6 @@
 #include <linux/ioport.h>
 #include <linux/clk.h>
 #include <linux/spinlock.h>
-#include <linux/delay.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
@@ -239,6 +238,16 @@ struct clk clk_xtal = {
        .ctrlbit        = 0,
 };
 
+struct clk clk_ext = {
+       .name           = "ext",
+       .id             = -1,
+};
+
+struct clk clk_epll = {
+       .name           = "epll",
+       .id             = -1,
+};
+
 struct clk clk_mpll = {
        .name           = "mpll",
        .id             = -1,
@@ -297,8 +306,6 @@ struct clk s3c24xx_uclk = {
 
 int s3c24xx_register_clock(struct clk *clk)
 {
-       clk->owner = THIS_MODULE;
-
        if (clk->enable == NULL)
                clk->enable = clk_null_enable;