summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1996-09-07 02:14:47 +0000
committerasami <asami@FreeBSD.org>1996-09-07 02:14:47 +0000
commit148ce94bebd89be1aab174e5e4af889f43ffdd6d (patch)
tree76c7c637f26dd9c707e9bc4cb86db9ba6765d078 /sys/conf
parent7b9ecd2de3dd0e21793ef47de26c51dbf4b2dff9 (diff)
downloadFreeBSD-src-148ce94bebd89be1aab174e5e4af889f43ffdd6d.zip
FreeBSD-src-148ce94bebd89be1aab174e5e4af889f43ffdd6d.tar.gz
Yet another merge. Remove support.s by deleting memcopy. Remove
autoconf.c by merging icu.h. Fix a couple of typos. Submitted by: The FreeBSD(98) Development Team.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/Makefile.pc984
-rw-r--r--sys/conf/files.pc9811
2 files changed, 7 insertions, 8 deletions
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index bc262d2..10f5742 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.pc98,v 1.3 1996/08/30 10:42:49 asami Exp $
+# $Id: Makefile.pc98,v 1.4 1996/09/03 10:23:11 asami Exp $
#
# Makefile for FreeBSD
#
@@ -172,7 +172,7 @@ install:
install -c -m 555 -o root -g wheel -fschg kernel /
ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h \
- ${I386}/isa/isa_device.h ${PC98}/pc98/pc98.h ${PC98}/pc98/icu.h
+ ${I386}/isa/isa_device.h ${PC98}/pc98/pc98.h ${I386}/isa/icu.h
${CC} -c ${CFLAGS} ioconf.c
param.c: $S/conf/param.c
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 47027cd..fb7d0d4 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -2,7 +2,7 @@
# files marked standard are always included.
#
# modified for PC-9801 after:
-# $Id: files.pc98,v 1.4 1996/09/03 10:23:12 asami Exp $
+# $Id: files.pc98,v 1.5 1996/09/04 09:52:08 asami Exp $
#
aic7xxx_asm optional ahc device-driver \
dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \
@@ -35,8 +35,8 @@ i386/apm/apm_setup.s optional apm
#i386/eisa/aic7770.c optional ahc device-driver
#i386/eisa/aha1742.c optional ahb device-driver
#i386/eisa/bt74x.c optional bt device-driver
-#i386/eisa/eisaconf.c optional eisa
-pc98/i386/autoconf.c standard device-driver
+i386/eisa/eisaconf.c optional eisa
+i386/i386/autoconf.c standard device-driver
i386/i386/cons.c standard
i386/i386/db_disasm.c optional ddb
i386/i386/db_interface.c optional ddb
@@ -56,7 +56,7 @@ pc98/i386/microtime.s standard
i386/i386/perfmon.c optional perfmon
pc98/i386/pmap.c standard
i386/i386/procfs_machdep.c standard
-pc98/i386/support.s standard
+i386/i386/support.s standard
i386/i386/swtch.s standard
i386/i386/sys_machdep.c standard
pc98/i386/trap.c standard
@@ -118,8 +118,7 @@ pc98/pc98/if_fe.c optional fe device-driver
#i386/isa/if_sr.c optional sr device-driver
#pc98/isa/if_ze.c optional ze device-driver
i386/isa/if_zp.c optional zp device-driver
-pc98/pc98/pc98.c optional nec device-driver
-pc98/pc98/pc98.c optional epson device-driver
+pc98/pc98/pc98.c optional isa device-driver
pc98/isa/istallion.c optional stli device-driver
pc98/isa/joy.c optional joy device-driver
pc98/pc98/labpc.c optional labpc device-driver
OpenPOWER on IntegriCloud