From 957053f51dd84626b0837fc80000293d0e1a7203 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 26 Apr 2007 11:45:32 +0900
Subject: [PATCH] --- yaml --- r: 54368 b: refs/heads/master c:
 005a336e71e9e3ea356f9afca5d66318d6901319 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/serial/sh-sci.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 05d0f6fb18a2..fd2df8d3bc32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1534a3b3dc1cbab006f0add253be1b095d738b82
+refs/heads/master: 005a336e71e9e3ea356f9afca5d66318d6901319
diff --git a/trunk/drivers/serial/sh-sci.c b/trunk/drivers/serial/sh-sci.c
index e5cf57f482cf..1f89496d530e 100644
--- a/trunk/drivers/serial/sh-sci.c
+++ b/trunk/drivers/serial/sh-sci.c
@@ -78,8 +78,10 @@ struct sci_port {
 	struct timer_list	break_timer;
 	int			break_flag;
 
+#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
 	/* Port clock */
 	struct clk		*clk;
+#endif
 };
 
 #ifdef CONFIG_SH_KGDB
@@ -958,7 +960,9 @@ static int sci_startup(struct uart_port *port)
 	if (s->enable)
 		s->enable(port);
 
+#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
 	s->clk = clk_get(NULL, "module_clk");
+#endif
 
 	sci_request_irq(s);
 	sci_start_tx(port);
@@ -978,8 +982,10 @@ static void sci_shutdown(struct uart_port *port)
 	if (s->disable)
 		s->disable(port);
 
+#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
 	clk_put(s->clk);
 	s->clk = NULL;
+#endif
 }
 
 static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
@@ -1231,6 +1237,11 @@ static int __init serial_console_setup(struct console *co, char *options)
 
 	port->type = serial_console_port->type;
 
+#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+	if (!serial_console_port->clk)
+		serial_console_port->clk = clk_get(NULL, "module_clk");
+#endif
+
 	if (port->flags & UPF_IOREMAP)
 		sci_config_port(port, 0);