diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-16 11:56:40 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-16 11:56:40 +0000 |
| commit | ab08be91e5dc66cfc42b85763d4caf94e2fd3d09 (patch) | |
| tree | 89caace66e8787764cc54b781a8cbfd881b69458 /sys/arch/hp300/conf/GENERIC | |
| parent | 75113d46e0ad67778c0741a5bfc96d9d686f7eec (diff) | |
Merge portions of NetBSD up to 970415.
This includes:
* All of the prototyping and KNF changes.
* The new interrupt system.
* Portions of the Domain Keyboard support from Mike Smith.
This does not include:
* m68k changes, namely generic dumps.
Various sundry changes and fixes by me.
Diffstat (limited to 'sys/arch/hp300/conf/GENERIC')
| -rw-r--r-- | sys/arch/hp300/conf/GENERIC | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC index 59aeeecf069..4354907d615 100644 --- a/sys/arch/hp300/conf/GENERIC +++ b/sys/arch/hp300/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.18 1997/02/24 01:16:07 downsj Exp $ +# $OpenBSD: GENERIC,v 1.19 1997/04/16 11:55:53 downsj Exp $ # $NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $ # # Generic kernel - one size fits all. @@ -109,5 +109,3 @@ oscsi* at dio? scode ? # Old HP SCSI sd* at oscsi? target ? lun ? # SCSI disks st* at oscsi? target ? lun ? # SCSI tapes ac* at oscsi? target ? lun ? # SCSI changers - -pseudo-device rd 2 |