diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2009-11-12 16:56:29 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-11-27 02:32:37 -0500 |
commit | 97adeda043d4c2e11dcaca64a7e5fd0c4574c3fe (patch) | |
tree | 6ffd371e9c0b8eea1a0f315e91a4dcb01d41fc07 /arch/arm/mach-mx2/clock_imx27.c | |
parent | 4998f1a30cf8e21c5bc0766fde4fa58e1adabd72 (diff) |
IMX: don't disable the uart clock if DEBUG_LL uses it
Before the clock was left enabled only for DEBUG_LL_CONSOLE which
requires an additional patch to exist at all. With this patch applied
DEBUG_LL_CONSOLE depends on DEBUG_LL, so this doesn't break.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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 aa640b4876c9..b010bf9ceaab 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) | |||
751 | clk_enable(&emi_clk); | 751 | clk_enable(&emi_clk); |
752 | clk_enable(&iim_clk); | 752 | clk_enable(&iim_clk); |
753 | 753 | ||
754 | #ifdef CONFIG_DEBUG_LL_CONSOLE | 754 | #if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC) |
755 | clk_enable(&uart1_clk); | 755 | clk_enable(&uart1_clk); |
756 | #endif | 756 | #endif |
757 | 757 | ||