diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:34:50 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:34:50 +0000 |
| commit | 677f4f64e4b2336682f0e15c69b206ade6f6b131 (patch) | |
| tree | 83b1f3e1f0de4c569e6c5adcf5e9934e6254f4e6 /arch/arm/mach-mx2/clock_imx27.c | |
| parent | 4567c4a89693416ccca02d32109bce967e9c1ade (diff) | |
| parent | fedea672a3aab3b99d03e69805ee423c73af1961 (diff) | |
| download | kernel_goldelico_gta04-677f4f64e4b2336682f0e15c69b206ade6f6b131.zip kernel_goldelico_gta04-677f4f64e4b2336682f0e15c69b206ade6f6b131.tar.gz kernel_goldelico_gta04-677f4f64e4b2336682f0e15c69b206ade6f6b131.tar.bz2 | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx2/clock_imx27.c')
| -rw-r--r-- | arch/arm/mach-mx2/clock_imx27.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c index aa640b48..b010bf9 100644 --- a/arch/arm/mach-mx2/clock_imx27.c +++ b/arch/arm/mach-mx2/clock_imx27.c @@ -751,7 +751,7 @@ int __init mx27_clocks_init(unsigned long fref) clk_enable(&emi_clk); clk_enable(&iim_clk); -#ifdef CONFIG_DEBUG_LL_CONSOLE +#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC) clk_enable(&uart1_clk); #endif |