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 branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
clock-pxa3xx.c
diff --git
a/arch/arm/mach-pxa/clock-pxa3xx.c
b/arch/arm/mach-pxa/clock-pxa3xx.c
index
1b08a34
..
3f864cd
100644
(file)
--- a/
arch/arm/mach-pxa/clock-pxa3xx.c
+++ b/
arch/arm/mach-pxa/clock-pxa3xx.c
@@
-115,7
+115,6
@@
static unsigned long clk_pxa3xx_smemc_getrate(struct clk *clk)
{
unsigned long acsr = ACSR;
unsigned long memclkcfg = __raw_readl(MEMCLKCFG);
- unsigned int smcfs = (acsr >> 23) & 0x7;
return BASE_CLK * smcfs_mult[(acsr >> 23) & 0x7] /
df_clkdiv[(memclkcfg >> 16) & 0x3];