diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /arch/mips/kernel/setup.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'arch/mips/kernel/setup.c')
| -rw-r--r-- | arch/mips/kernel/setup.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index b8a2b4303..fd6650b1c 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.17 1999/08/20 21:59:02 ralf Exp $ +/* $Id: setup.c,v 1.18 1999/09/18 20:48:03 harald Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -30,7 +30,6 @@ #endif #include <linux/ide.h> #ifdef CONFIG_RTC -#include <linux/ioport.h> #include <linux/timex.h> #endif @@ -67,15 +66,6 @@ char cyclecounter_available; */ int EISA_bus = 0; -/* - * Milo passes some information to the kernel that looks like as if it - * had been returned by a Intel PC BIOS. Milo doesn't fill the passed - * drive_info and Linux can find out about this anyway, so I'm going to - * remove this sometime. screen_info contains information about the - * resolution of the text screen. For VGA graphics based machine this - * information is being use to continue the screen output just below - * the BIOS printed text and with the same text resolution. - */ struct screen_info screen_info; #ifdef CONFIG_BLK_DEV_FD |