From 8865a3e121a63dff18ab2b3279e5e1183253a0f8 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 25 Apr 2008 16:04:20 +0900
Subject: [PATCH] --- yaml --- r: 96273 b: refs/heads/master c:
 85f094ecb1c52b9ec9a88c9d2c8beaba72b4f21f h: refs/heads/master i:   96271:
 95cdc14dbc16205566743490058e2efd2908a3f9 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/serial/sh-sci.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 025be0f7c420..667a31dafec8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e2c2872bd481ee20758d7cf4860f4ad1cefff98
+refs/heads/master: 85f094ecb1c52b9ec9a88c9d2c8beaba72b4f21f
diff --git a/trunk/drivers/serial/sh-sci.c b/trunk/drivers/serial/sh-sci.c
index 969106187718..0a051bca01c7 100644
--- a/trunk/drivers/serial/sh-sci.c
+++ b/trunk/drivers/serial/sh-sci.c
@@ -42,14 +42,12 @@
 #include <linux/console.h>
 #include <linux/platform_device.h>
 #include <linux/serial_sci.h>
-
-#ifdef CONFIG_CPU_FREQ
 #include <linux/notifier.h>
 #include <linux/cpufreq.h>
-#endif
-
-#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+#include <linux/clk.h>
 #include <linux/ctype.h>
+
+#ifdef CONFIG_SUPERH
 #include <asm/clock.h>
 #include <asm/sh_bios.h>
 #include <asm/kgdb.h>
@@ -80,7 +78,7 @@ struct sci_port {
 	struct timer_list	break_timer;
 	int			break_flag;
 
-#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+#ifdef CONFIG_SUPERH
 	/* Port clock */
 	struct clk		*clk;
 #endif