summaryrefslogtreecommitdiffstats
path: root/sys/i386/conf
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2000-01-10 02:29:23 +0000
committerimp <imp@FreeBSD.org>2000-01-10 02:29:23 +0000
commit0ee4c70711a39cff5f17c3ef63329ff92fdfca48 (patch)
tree1380b7b0b476e4ec072b78fd587bd711abba0696 /sys/i386/conf
parentbbb4b43d9a661307a7f904d4c4113ad10fb7381d (diff)
downloadFreeBSD-src-0ee4c70711a39cff5f17c3ef63329ff92fdfca48.zip
FreeBSD-src-0ee4c70711a39cff5f17c3ef63329ff92fdfca48.tar.gz
Uncomment pcic device and put pccard in GENERIC. PCCARD will be removed
in a little while as soon as I find all the places it is used in the tree.
Diffstat (limited to 'sys/i386/conf')
-rw-r--r--sys/i386/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 55ad451..011fb90 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -134,9 +134,9 @@ device npx0 at nexus? port IO_NPX irq 13
device apm0 at nexus? disable flags 0x20 # Advanced Power Management
# PCCARD (PCMCIA) support
-#device card0
-#device pcic0 at isa?
-#device pcic1 at isa?
+device card0
+device pcic0 at isa? irq 10 port 0x3e0 iomem 0xd0000
+device pcic1 at isa? irq 11 port 0x3e2 iomem 0xd4000 disable
# Serial (COM) ports
device sio0 at isa? port IO_COM1 flags 0x10 irq 4
OpenPOWER on IntegriCloud