diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 12:39:04 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 12:39:04 +0000 |
| commit | 073154459b80a43f7e4f088b11c93c8e9cb07f14 (patch) | |
| tree | c81603910b742fbb0e4129034e5011364a9c7418 /arch/arm/mach-pxa/clock-pxa3xx.c | |
| parent | c76d292db9869ae73fd401e9a3fc728ed5caf0a7 (diff) | |
| parent | ea0c4f3ca8a55e7e3138c2c4b3e9f7fe34d3ecab (diff) | |
| download | linux-073154459b80a43f7e4f088b11c93c8e9cb07f14.tar.gz linux-073154459b80a43f7e4f088b11c93c8e9cb07f14.tar.bz2 linux-073154459b80a43f7e4f088b11c93c8e9cb07f14.zip | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/clock-pxa3xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/clock-pxa3xx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/clock-pxa3xx.c b/arch/arm/mach-pxa/clock-pxa3xx.c index 1b08a34ab234..3f864cd0bd28 100644 --- 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]; |