diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /arch/arm/mach-s3c2410/clock.c | |
| parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
| parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'arch/arm/mach-s3c2410/clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c index 6de713ad319a..99d174612b53 100644 --- a/arch/arm/mach-s3c2410/clock.c +++ b/arch/arm/mach-s3c2410/clock.c | |||
| @@ -70,7 +70,7 @@ void inline s3c24xx_clk_enable(unsigned int clocks, unsigned int enable) | |||
| 70 | clkcon &= ~clocks; | 70 | clkcon &= ~clocks; |
| 71 | 71 | ||
| 72 | /* ensure none of the special function bits set */ | 72 | /* ensure none of the special function bits set */ |
| 73 | clkcon &= ~(S3C2410_CLKCON_IDLE|S3C2410_CLKCON_POWER); | 73 | clkcon &= ~(S3C2410_CLKCON_IDLE|S3C2410_CLKCON_POWER | 3); |
| 74 | 74 | ||
| 75 | __raw_writel(clkcon, S3C2410_CLKCON); | 75 | __raw_writel(clkcon, S3C2410_CLKCON); |
| 76 | } | 76 | } |