diff options
author | Paul Mackerras <paulus@samba.org> | 2008-09-10 05:36:13 +0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-09-10 05:36:13 +0400 |
commit | 7e392f8c29ee045c6a29d50193d2fb10712eceb0 (patch) | |
tree | c84097fe644c50c82f087ab7fa2d75167b8c0e16 /arch/arm/mach-pxa/pxa300.c | |
parent | 7713fef06517d216f96ee7c8ad750e72bc08d38f (diff) | |
parent | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (diff) | |
download | linux-7e392f8c29ee045c6a29d50193d2fb10712eceb0.tar.xz |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/arm/mach-pxa/pxa300.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa300.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c index 494fc1f032db..9adc7fc4618a 100644 --- a/arch/arm/mach-pxa/pxa300.c +++ b/arch/arm/mach-pxa/pxa300.c @@ -90,7 +90,9 @@ static struct clk common_clks[] = { }; static struct clk pxa310_clks[] = { +#ifdef CONFIG_CPU_PXA310 PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev), +#endif }; static int __init pxa300_init(void) |