diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-27 23:20:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-27 23:20:03 +0000 |
| commit | 89eba5eb77bbf92ffed6686c951cc35f4027e71f (patch) | |
| tree | b56887b1753ca2573002bc7f60e5f3e47c33b116 /arch/sh | |
| parent | f7ff3f5a67747c7714c3db772d05965a0c033705 (diff) | |
Merge with Linux 2.4.0-test5-pre5.
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/setup.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/sh_bios.c | 2 |
2 files changed, 1 insertions, 2 deletions
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 |