IMX: don't disable the uart clock if DEBUG_LL uses it

[sfrench/cifs-2.6.git] / arch / arm / mach-mx2 / clock_imx21.c

diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c
index eede79855f4af0565217f94c7b2e8ce6412f9e56..91901b5d56c2e63a871da04fbb489140f83ec3ea 100644 (file)
--- a/arch/arm/mach-mx2/clock_imx21.c
+++ b/arch/arm/mach-mx2/clock_imx21.c
@@ -1000,7 +1000,7 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href)
        clk_enable(&per_clk[0]);
        clk_enable(&gpio_clk);
 
-#ifdef CONFIG_DEBUG_LL_CONSOLE
+#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)
        clk_enable(&uart_clk[0]);
 #endif