diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-05-29 10:15:55 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-05-29 10:15:55 +0000 |
commit | ef9b5449c466470e5241ed75226f1d70921ec10c (patch) | |
tree | eed1e5d5c1692c582fe6a670ff97f50c75f1a66c /sys/arch/amiga/conf/std.amiga | |
parent | a7586fe5b7fc8cab4fec3c60ca9dc5f2dcdd8627 (diff) |
Merge of 960526 NetBSD
Diffstat (limited to 'sys/arch/amiga/conf/std.amiga')
-rw-r--r-- | sys/arch/amiga/conf/std.amiga | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/amiga/conf/std.amiga b/sys/arch/amiga/conf/std.amiga index 6ef97f53568..8840cf9a9b5 100644 --- a/sys/arch/amiga/conf/std.amiga +++ b/sys/arch/amiga/conf/std.amiga @@ -1,5 +1,5 @@ -# $OpenBSD: std.amiga,v 1.2 1996/05/02 06:43:30 niklas Exp $ -# $NetBSD: std.amiga,v 1.7 1996/04/27 20:51:09 veego Exp $ +# $OpenBSD: std.amiga,v 1.3 1996/05/29 10:14:46 niklas Exp $ +# $NetBSD: std.amiga,v 1.8 1996/05/09 20:31:03 is Exp $ # standard amiga information @@ -15,5 +15,3 @@ ms* at mainbus0 fdc0 at mainbus0 fd* at fdc0 unit ? zbus0 at mainbus0 - -#pseudo-device mouse 2 |