git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
s3c2412-clock.c
diff --git
a/arch/arm/mach-s3c2410/s3c2412-clock.c
b/arch/arm/mach-s3c2410/s3c2412-clock.c
index
c95ed3e
..
8f94ad8
100644
(file)
--- a/
arch/arm/mach-s3c2410/s3c2412-clock.c
+++ b/
arch/arm/mach-s3c2410/s3c2412-clock.c
@@
-30,13
+30,18
@@
#include <linux/clk.h>
#include <linux/mutex.h>
#include <linux/delay.h>
#include <linux/clk.h>
#include <linux/mutex.h>
#include <linux/delay.h>
+#include <linux/serial_core.h>
+
+#include <asm/mach/map.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/hardware.h>
#include <asm/io.h>
+#include <asm/arch/regs-serial.h>
#include <asm/arch/regs-clock.h>
#include <asm/arch/regs-gpio.h>
#include <asm/arch/regs-clock.h>
#include <asm/arch/regs-gpio.h>
+#include "s3c2412.h"
#include "clock.h"
#include "cpu.h"
#include "clock.h"
#include "cpu.h"
@@
-49,7
+54,7
@@
* set the correct muxing at initialisation
*/
* set the correct muxing at initialisation
*/
-int s3c2412_clkcon_enable(struct clk *clk, int enable)
+
static
int s3c2412_clkcon_enable(struct clk *clk, int enable)
{
unsigned int clocks = clk->ctrlbit;
unsigned long clkcon;
{
unsigned int clocks = clk->ctrlbit;
unsigned long clkcon;
@@
-556,7
+561,7
@@
struct clk_init {
struct clk *src_1;
};
struct clk *src_1;
};
-struct clk_init clks_src[] __initdata = {
+st
atic st
ruct clk_init clks_src[] __initdata = {
{
.clk = &clk_usysclk,
.bit = S3C2412_CLKSRC_USBCLK_HCLK,
{
.clk = &clk_usysclk,
.bit = S3C2412_CLKSRC_USBCLK_HCLK,
@@
-619,7
+624,7
@@
static void __init s3c2412_clk_initparents(void)
/* clocks to add straight away */
/* clocks to add straight away */
-struct clk *clks[] __initdata = {
+st
atic st
ruct clk *clks[] __initdata = {
&clk_ext,
&clk_usb_bus,
&clk_erefclk,
&clk_ext,
&clk_usb_bus,
&clk_erefclk,