summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2009-11-12 22:56:29 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2009-11-27 08:32:37 +0100
commit97adeda043d4c2e11dcaca64a7e5fd0c4574c3fe (patch)
tree6ffd371e9c0b8eea1a0f315e91a4dcb01d41fc07 /arch/arm/mach-mx3
parent4998f1a30cf8e21c5bc0766fde4fa58e1adabd72 (diff)
downloadop-kernel-dev-97adeda043d4c2e11dcaca64a7e5fd0c4574c3fe.zip
op-kernel-dev-97adeda043d4c2e11dcaca64a7e5fd0c4574c3fe.tar.gz
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-mx3')
-rw-r--r--arch/arm/mach-mx3/clock-imx35.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c
index 02a9a18..18d4775 100644
--- a/arch/arm/mach-mx3/clock-imx35.c
+++ b/arch/arm/mach-mx3/clock-imx35.c
@@ -485,7 +485,7 @@ int __init mx35_clocks_init()
int i;
unsigned int ll = 0;
-#ifdef CONFIG_DEBUG_LL_CONSOLE
+#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)
ll = (3 << 16);
#endif
OpenPOWER on IntegriCloud