diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-08-26 12:56:05 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-08-26 12:56:05 -0400 |
| commit | 3dae49abef945c55c10fa7c479cfd8fd13af55db (patch) | |
| tree | 487c47c6d23cc28a259b913396aeaff0b792d32d /arch/arm/mach-pxa/pxa300.c | |
| parent | 6ce5eecb9cd3ac97b952c50309b87c31488a45e9 (diff) | |
| parent | b8e6c91c74e9f0279b7c51048779b3d62da60b88 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/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[] = { | |||
| 90 | }; | 90 | }; |
| 91 | 91 | ||
| 92 | static struct clk pxa310_clks[] = { | 92 | static struct clk pxa310_clks[] = { |
| 93 | #ifdef CONFIG_CPU_PXA310 | ||
| 93 | PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev), | 94 | PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev), |
| 95 | #endif | ||
| 94 | }; | 96 | }; |
| 95 | 97 | ||
| 96 | static int __init pxa300_init(void) | 98 | static int __init pxa300_init(void) |