From 38a50588a54f742052fba420105f75a171ed4364 Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Mon, 11 Oct 2010 11:05:18 +0000
Subject: [PATCH] --- yaml --- r: 217015 b: refs/heads/master c:
 a1b04cc197e17c47b043051becb548dc8c60c886 h: refs/heads/master i:   217013:
 4dd3e0eafbd3ffe5faf848bbbad0d98ec0ef74b8   217011:
 8a15d52c80841b4e05573f565824e828d01e1bda   217007:
 d686319bc5e3e37e61490df589bee266ac2180e4 v: v3

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

diff --git a/[refs] b/[refs]
index ddf3bd0c5b61..868d455dc31d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de65815860f187cb43551bc833bf9d72720faa01
+refs/heads/master: a1b04cc197e17c47b043051becb548dc8c60c886
diff --git a/trunk/arch/arm/mach-omap2/serial.c b/trunk/arch/arm/mach-omap2/serial.c
index 338e46a844a4..ba8a5cc8eae8 100644
--- a/trunk/arch/arm/mach-omap2/serial.c
+++ b/trunk/arch/arm/mach-omap2/serial.c
@@ -608,7 +608,11 @@ static DEVICE_ATTR(sleep_timeout, 0644, sleep_timeout_show,
 #define DEV_CREATE_FILE(dev, attr) WARN_ON(device_create_file(dev, attr))
 #else
 static inline void omap_uart_idle_init(struct omap_uart_state *uart) {}
-static void omap_uart_block_sleep(struct omap_uart_state *uart) {}
+static void omap_uart_block_sleep(struct omap_uart_state *uart)
+{
+	/* Needed to enable UART clocks when built without CONFIG_PM */
+	omap_uart_enable_clocks(uart);
+}
 #define DEV_CREATE_FILE(dev, attr)
 #endif /* CONFIG_PM */