git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
s3c244x.c
diff --git
a/arch/arm/mach-s3c2410/s3c244x.c
b/arch/arm/mach-s3c2410/s3c244x.c
index
96852a7
..
838bc52
100644
(file)
--- a/
arch/arm/mach-s3c2410/s3c244x.c
+++ b/
arch/arm/mach-s3c2410/s3c244x.c
@@
-34,6
+34,7
@@
#include <asm/arch/regs-gpioj.h>
#include <asm/arch/regs-dsc.h>
#include <asm/arch/regs-gpioj.h>
#include <asm/arch/regs-dsc.h>
+#include "s3c2410.h"
#include "s3c2440.h"
#include "s3c244x.h"
#include "clock.h"
#include "s3c2440.h"
#include "s3c244x.h"
#include "clock.h"
@@
-118,6
+119,7
@@
void __init s3c244x_init_clocks(int xtal)
*/
s3c24xx_setup_clocks(xtal, fclk, hclk, pclk);
*/
s3c24xx_setup_clocks(xtal, fclk, hclk, pclk);
+ s3c2410_baseclk_add();
}
#ifdef CONFIG_PM
}
#ifdef CONFIG_PM