Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc/conf Fix commented out pcmcia entries: adjust...



details:   https://anonhg.NetBSD.org/src/rev/a717f30d3980
branches:  trunk
changeset: 556458:a717f30d3980
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Dec 17 08:08:02 2003 +0000

description:
Fix commented out pcmcia entries: adjust comments, add FULL_SPARC_BUS_SPACE,
adapt wd* at pcmcia to new atabus attachment, and add wi* at pcmcia.
Noticed by Michael Wolfson.

diffstat:

 sys/arch/sparc/conf/GENERIC |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 8c0b7677a861 -r a717f30d3980 sys/arch/sparc/conf/GENERIC
--- a/sys/arch/sparc/conf/GENERIC       Wed Dec 17 07:14:03 2003 +0000
+++ b/sys/arch/sparc/conf/GENERIC       Wed Dec 17 08:08:02 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.148 2003/10/07 09:43:58 tron Exp $
+# $NetBSD: GENERIC,v 1.149 2003/12/17 08:08:02 martin Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.148 $"
+#ident                 "GENERIC-$Revision: 1.149 $"
 
 maxusers       32
 
@@ -233,7 +233,7 @@
 sbus*  at xbox?
 
 ## SBus to PCMCIA bridge
-# Currently enabling nell* with audioamd* causes panic at attach
+#options       FULL_SPARC_BUS_SPACE
 #nell* at sbus? slot ? offset ?                # PCMCIA bridge
 #pcmcia*       at nell?
 
@@ -416,7 +416,11 @@
 
 ## PCMCIA IDE controllers
 #wdc*  at pcmcia?
-#wd*   at wdc?
+#atabus* at ata?
+#wd*   at atabus? drive ? flags 0x0000
+
+## PCMCIA wavelan card
+#wi*   at pcmcia? function ?           # Lucent WaveLan IEEE (802.11)
 
 ## A disk-like interface to files.  Can be used to create floppy, CD,
 ## miniroot images, etc.



Home | Main Index | Thread Index | Old Index