From 09b73b2614a06cfbe26701be131574975277032f Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Wed, 9 May 2001 19:37:25 +0000
Subject: Add in commented out entries for NEWCARD so that they are at least
 documented.  They cannot be turned on by default due to conflicting symbols
 at link time between OLDCARD and NEWCARD.

Approved by:	imp
---
 sys/conf/NOTES | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'sys/conf')

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 2c7115a..bd884f2 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2212,6 +2212,7 @@ device		bktr	1
 
 #
 # PC Card/PCMCIA
+# (OLDCARD)
 #
 # card: pccard slots
 # pcic: isa/pccard bridge
@@ -2220,6 +2221,20 @@ hint.pcic.0.at="isa"
 hint.pcic.1.at="isa"
 device		card
 
+#
+# PC Card/PCMCIA and Cardbus
+# (NEWCARD)
+#
+# Note that NEWCARD and OLDCARD are incompatible.  Do not use both at the same
+# time.
+#
+# pccbb: isa/pccard and pci/cardbus bridge
+# pccard: pccard slots
+# cardbus: cardbus slots
+#device		pccbb
+#device		pccard
+#device		cardbus
+
 # You may need to reset all pccards after resuming
 options 	PCIC_RESUME_RESET	# reset after resume
 
-- 
cgit v1.1