From owner-cvs-sys  Wed Sep  4 02:52:51 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id CAA04247
          for cvs-sys-outgoing; Wed, 4 Sep 1996 02:52:51 -0700 (PDT)
Received: (from asami@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id CAA04225;
          Wed, 4 Sep 1996 02:52:34 -0700 (PDT)
Date: Wed, 4 Sep 1996 02:52:34 -0700 (PDT)
From: Satoshi Asami <asami>
Message-Id: <199609040952.CAA04225@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/i386/isa isa_device.h src/sys/pc98/conf files.pc98 src/sys/pc98/i386 machdep.c trap.c src/sys/pc98/pc98 spkr.c syscons.c syscons.h mk30line pcic.h pcicx.c scd.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

asami       96/09/04 02:52:33

  Modified:    sys/i386/isa  isa_device.h
               sys/pc98/conf  files.pc98
               sys/pc98/i386  machdep.c trap.c
               sys/pc98/pc98  spkr.c syscons.c syscons.h
  Removed:     sys/pc98/pc98  mk30line pcic.h pcicx.c scd.c
  Log:
  More merge.
  
  (1) Remove mk30line (moved to /usr/sbin, but not in our source tree yet)
  
  (2) Delete unneeded (well, harmful now :) code to prohibit #including
      of isa_device.h from PC98 sources.
  
  (3) Remove files now equal to their ISA/PC-AT counterparts.
  
  Submitted by:	The FreeBSD(98) Development Team
  
  Revision  Changes    Path
  1.31      +1 -5      src/sys/i386/isa/isa_device.h
  1.5       +5 -5      src/sys/pc98/conf/files.pc98
  1.5       +49 -32    src/sys/pc98/i386/machdep.c
  1.5       +2 -2      src/sys/pc98/i386/trap.c
  1.4       +2 -3      src/sys/pc98/pc98/spkr.c
  1.6       +345 -295  src/sys/pc98/pc98/syscons.c
  1.3       +7 -5      src/sys/pc98/pc98/syscons.h