diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 14:59:19 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 14:59:19 +0200 |
| commit | 2f540738f8d228016c6cd0d3b303896c174ecee3 (patch) | |
| tree | 7e6574c041ac4386763f94d3d401d70f4ab6f55b /arch/arm/mach-s3c2443 | |
| parent | a3849a4c038a21075a0bc7eaf37f65a93976d10c (diff) | |
| parent | d8e9c00e38f6947cef7f5466a0a3d369461ab97f (diff) | |
| download | kernel_goldelico_gta04-2f540738f8d228016c6cd0d3b303896c174ecee3.zip kernel_goldelico_gta04-2f540738f8d228016c6cd0d3b303896c174ecee3.tar.gz kernel_goldelico_gta04-2f540738f8d228016c6cd0d3b303896c174ecee3.tar.bz2 | |
Merge branch 'tegra/cleanup' into next/cleanup
Diffstat (limited to 'arch/arm/mach-s3c2443')
| -rw-r--r-- | arch/arm/mach-s3c2443/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index a1a7176..38058af 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c @@ -128,7 +128,7 @@ static int s3c2443_armclk_setrate(struct clk *clk, unsigned long rate) unsigned long clkcon0; clkcon0 = __raw_readl(S3C2443_CLKDIV0); - clkcon0 &= S3C2443_CLKDIV0_ARMDIV_MASK; + clkcon0 &= ~S3C2443_CLKDIV0_ARMDIV_MASK; clkcon0 |= val << S3C2443_CLKDIV0_ARMDIV_SHIFT; __raw_writel(clkcon0, S3C2443_CLKDIV0); } |