From b87cc041a1b4b26ab641c21da8057d59d1e9381a Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Sat, 22 Aug 2009 13:30:12 +0530
Subject: [PATCH] --- yaml --- r: 163135 b: refs/heads/master c:
 aae290fb4d64e2b09b659f4b8a7f9d2547ef63b1 h: refs/heads/master i:   163133:
 64f012d7dec85f4107558160090df9cfd683bba7   163131:
 126a2db8e28393dda75e0dd4bdb27ef844fbe387   163127:
 51da27dc2da7b8b893fb1bd6c560e481cd07111d   163119:
 5ffd8ac7edab076d821b1498bc5629f5ef9beb10   163103:
 da31e8d6c6567add2e4e9a5d6e5c6eb1b2dc78a5   163071:
 16f497a87ddfb74802858f8d1e55016a2f96c062 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-omap2/serial.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7fa35e64b4ec..2cc4d2cefab0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e3eaadfe3da84f98250ad8a2c36e87fe00e42ee
+refs/heads/master: aae290fb4d64e2b09b659f4b8a7f9d2547ef63b1
diff --git a/trunk/arch/arm/mach-omap2/serial.c b/trunk/arch/arm/mach-omap2/serial.c
index 645546cbd265..0f508109adcc 100644
--- a/trunk/arch/arm/mach-omap2/serial.c
+++ b/trunk/arch/arm/mach-omap2/serial.c
@@ -609,8 +609,11 @@ void __init omap_serial_init(void)
 			uart->fck = NULL;
 		}
 
-		if (!uart->ick || !uart->fck)
-			continue;
+		/* FIXME: Remove this once the clkdev is ready */
+		if (!cpu_is_omap44xx()) {
+			if (!uart->ick || !uart->fck)
+				continue;
+		}
 
 		uart->num = i;
 		p->private_data = uart;