---

yaml --- r: 217015 b: refs/heads/master c: a1b04cc h: refs/heads/master i: 217013: 4dd3e0e 217011: 8a15d52 217007: d686319 v: v3
git-mirror · Oct 11, 2010 · 38a5058 · 38a5058
1 parent f15f9c2
commit 38a5058
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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 */