diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/mach-mx2/clock_imx21.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/arm/mach-mx2/clock_imx21.c')
| -rw-r--r-- | arch/arm/mach-mx2/clock_imx21.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c index eede79855f4..91901b5d56c 100644 --- 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) | |||
| 1000 | clk_enable(&per_clk[0]); | 1000 | clk_enable(&per_clk[0]); |
| 1001 | clk_enable(&gpio_clk); | 1001 | clk_enable(&gpio_clk); |
| 1002 | 1002 | ||
| 1003 | #ifdef CONFIG_DEBUG_LL_CONSOLE | 1003 | #if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC) |
| 1004 | clk_enable(&uart_clk[0]); | 1004 | clk_enable(&uart_clk[0]); |
| 1005 | #endif | 1005 | #endif |
| 1006 | 1006 | ||