Module Name: src
Committed By: rkujawa
Date: Thu Jan 19 22:43:11 UTC 2012
Modified Files:
src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL
Log Message:
Don\'t forget to disable atabus* when disabling the efa driver.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.282 -r1.283 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/amiga/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.152 src/sys/arch/amiga/conf/DRACO:1.153
--- src/sys/arch/amiga/conf/DRACO:1.152 Thu Jan 19 22:11:49 2012
+++ src/sys/arch/amiga/conf/DRACO Thu Jan 19 22:43:11 2012
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.152 2012/01/19 22:11:49 rkujawa Exp $
+# $NetBSD: DRACO,v 1.153 2012/01/19 22:43:11 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.93 2012/01/19 00:14:08 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.152 $"
+#ident "GENERIC-$Revision: 1.153 $"
maxusers 8
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.282 src/sys/arch/amiga/conf/GENERIC:1.283
--- src/sys/arch/amiga/conf/GENERIC:1.282 Thu Jan 19 22:11:49 2012
+++ src/sys/arch/amiga/conf/GENERIC Thu Jan 19 22:43:11 2012
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.282 2012/01/19 22:11:49 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.283 2012/01/19 22:43:11 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.93 2012/01/19 00:14:08 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.282 $"
+#ident "GENERIC-$Revision: 1.283 $"
maxusers 8
@@ -432,7 +432,7 @@ wdc* at zbus0 # Buddha / Catweasel
#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
atabus* at wdc? channel ? # ATA bus
-atabus* at efa? channel ? # ATA bus
+#atabus* at efa? channel ? # ATA bus
wd* at atabus? drive ? # + drives
atapibus* at atabus? # ATAPI bus
cd* at atapibus? drive ? # ATAPI CD-ROM drives
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.94 src/sys/arch/amiga/conf/GENERIC.in:1.95
--- src/sys/arch/amiga/conf/GENERIC.in:1.94 Thu Jan 19 22:11:49 2012
+++ src/sys/arch/amiga/conf/GENERIC.in Thu Jan 19 22:43:11 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.95 2012/01/19 22:43:11 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.94 $"
+#ident "GENERIC-$Revision: 1.95 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -513,7 +513,7 @@ wdc* at zbus0 # Buddha / Catweasel
#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
atabus* at wdc? channel ? # ATA bus
-atabus* at efa? channel ? # ATA bus
+#atabus* at efa? channel ? # ATA bus
wd* at atabus? drive ? # + drives
atapibus* at atabus? # ATAPI bus
cd* at atapibus? drive ? # ATAPI CD-ROM drives
Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.104 src/sys/arch/amiga/conf/INSTALL:1.105
--- src/sys/arch/amiga/conf/INSTALL:1.104 Thu Jan 19 22:11:49 2012
+++ src/sys/arch/amiga/conf/INSTALL Thu Jan 19 22:43:11 2012
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL,v 1.104 2012/01/19 22:11:49 rkujawa Exp $
+# $NetBSD: INSTALL,v 1.105 2012/01/19 22:43:11 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.93 2012/01/19 00:14:08 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.104 $"
+#ident "GENERIC-$Revision: 1.105 $"
makeoptions COPTS="-Os"
@@ -378,7 +378,7 @@ wdc* at zbus0 # Buddha / Catweasel
#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
atabus* at wdc? channel ? # ATA bus
-atabus* at efa? channel ? # ATA bus
+#atabus* at efa? channel ? # ATA bus
wd* at atabus? drive ? # + drives
atapibus* at atabus? # ATAPI bus
cd* at atapibus? drive ? # ATAPI CD-ROM drives
