From 89eba5eb77bbf92ffed6686c951cc35f4027e71f Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 27 Jul 2000 23:20:03 +0000
Subject: Merge with Linux 2.4.0-test5-pre5.

---
 arch/sh/kernel/setup.c   | 1 -
 arch/sh/kernel/sh_bios.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'arch/sh')

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 69988d873..be56f8570 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -38,7 +38,6 @@
 #include <asm/io.h>
 #include <asm/smp.h>
 #ifdef CONFIG_SH_EARLY_PRINTK
-#include <linux/console.h>
 #include <asm/sh_bios.h>
 #endif
 
diff --git a/arch/sh/kernel/sh_bios.c b/arch/sh/kernel/sh_bios.c
index 9c6b107a6..a24b4a842 100644
--- a/arch/sh/kernel/sh_bios.c
+++ b/arch/sh/kernel/sh_bios.c
@@ -7,7 +7,7 @@
  *
  */
 
-#include <config/sh/standard/bios.h>
+#include <linux/config.h>
 #include <asm/sh_bios.h>
 
 #ifdef CONFIG_SH_STANDARD_BIOS
-- 
cgit v1.2.3