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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
include
/
mach
/
regs-clock.h
diff --git
a/arch/arm/mach-s3c64xx/include/mach/regs-clock.h
b/arch/arm/mach-s3c64xx/include/mach/regs-clock.h
index
3ef6274
..
0114eb0
100644
(file)
--- a/
arch/arm/mach-s3c64xx/include/mach/regs-clock.h
+++ b/
arch/arm/mach-s3c64xx/include/mach/regs-clock.h
@@
-33,6
+33,7
@@
#define S3C_PCLK_GATE S3C_CLKREG(0x34)
#define S3C_SCLK_GATE S3C_CLKREG(0x38)
#define S3C_MEM0_GATE S3C_CLKREG(0x3C)
+#define S3C6410_CLK_SRC2 S3C_CLKREG(0x10C)
/* CLKDIV0 */
#define S3C6400_CLKDIV0_PCLK_MASK (0xf << 12)