diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 07:27:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 07:27:34 -0400 |
| commit | f9cef506815386df4bd7e463b59e0a0984ce0355 (patch) | |
| tree | b26a202b2f0472e3ebe889012312b115917717f9 /arch/arm/mach-s5p6442/include/mach/regs-clock.h | |
| parent | 9ae21ca362679757786f5abe556c7943e9001426 (diff) | |
| parent | cbff3eb3e6e3c618583a7435f87c1548aa12b0ad (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mach-s3c64xx/dev-audio.c
Diffstat (limited to 'arch/arm/mach-s5p6442/include/mach/regs-clock.h')
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/regs-clock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6442/include/mach/regs-clock.h b/arch/arm/mach-s5p6442/include/mach/regs-clock.h index d8360b5d4ece..00828a336991 100644 --- a/arch/arm/mach-s5p6442/include/mach/regs-clock.h +++ b/arch/arm/mach-s5p6442/include/mach/regs-clock.h | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #define S5P_CLK_DIV5 S5P_CLKREG(0x314) | 46 | #define S5P_CLK_DIV5 S5P_CLKREG(0x314) |
| 47 | #define S5P_CLK_DIV6 S5P_CLKREG(0x318) | 47 | #define S5P_CLK_DIV6 S5P_CLKREG(0x318) |
| 48 | 48 | ||
| 49 | #define S5P_CLKGATE_IP0 S5P_CLKREG(0x460) | ||
| 49 | #define S5P_CLKGATE_IP3 S5P_CLKREG(0x46C) | 50 | #define S5P_CLKGATE_IP3 S5P_CLKREG(0x46C) |
| 50 | 51 | ||
| 51 | /* CLK_OUT */ | 52 | /* CLK_OUT */ |