From: Tony Lindgren <tony@atomide.com>
Date: Mon, 25 Sep 2006 10:04:32 +0000 (+0300)
Subject: ARM: OMAP: Sync clock code with mainline
X-Git-Tag: v2.6.18-omap1~42
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=58bbb19f28c93f92b46fc8d65711570582a3be13;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Sync clock code with mainline

These can be static now that CONFIG_OMAP_RESET_CLOCKS
is rearranged.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 7a25e8dc565..638490e62d5 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -630,8 +630,6 @@ static void __init omap1_clk_disable_unused(struct clk *clk)
 	printk(KERN_INFO "Disabling unused clock \"%s\"... ", clk->name);
 	clk->disable(clk);
 	printk(" done\n");
-
-	return 0;
 }
 
 #else
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 73a2aec0f88..969e6ea2891 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -11,7 +11,6 @@
  * published by the Free Software Foundation.
  */
 #include <linux/version.h>
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -28,9 +27,9 @@
 
 #include <asm/arch/clock.h>
 
-LIST_HEAD(clocks);
-DEFINE_SPINLOCK(clockfw_lock);
+static LIST_HEAD(clocks);
 static DEFINE_MUTEX(clocks_mutex);
+static DEFINE_SPINLOCK(clockfw_lock);
 
 static struct clk_functions *arch_clock;
 
diff --git a/include/asm-arm/arch-omap/clock.h b/include/asm-arm/arch-omap/clock.h
index 53e89494cd6..fa688104990 100644
--- a/include/asm-arm/arch-omap/clock.h
+++ b/include/asm-arm/arch-omap/clock.h
@@ -49,8 +49,6 @@ struct clk_functions {
 };
 
 extern unsigned int mpurate;
-extern struct list_head clocks;
-extern spinlock_t clockfw_lock;
 
 extern int clk_init(struct clk_functions * custom_clocks);
 extern int clk_register(struct clk *clk);