summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorrink <rink@FreeBSD.org>2008-03-06 08:09:45 +0000
committerrink <rink@FreeBSD.org>2008-03-06 08:09:45 +0000
commitee4e7828cdb57507969deca833b219caff37cc93 (patch)
tree070f46e4e7f09e55dbbe8d10c82b57ff8da3a7cf /sys/conf
parent93eb2896b594fd48abfd536e527490d24931750e (diff)
downloadFreeBSD-src-ee4e7828cdb57507969deca833b219caff37cc93.zip
FreeBSD-src-ee4e7828cdb57507969deca833b219caff37cc93.tar.gz
Commit cmx(4), a driver for Omnikey CardMan 4040 PCMCIA smartcard readers.
PR: kern/114582 Submitted by: Daniel Roethlisberger <daniel@roe.ch> Reviewed by: imp, myself Tested by: johans, myself MFC after: 2 weeks
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES2
-rw-r--r--sys/conf/files2
2 files changed, 4 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 815349b..dfa3d8d 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2115,6 +2115,7 @@ device tnt4882
# rc: RISCom/8 multiport card
# rp: Comtrol Rocketport(ISA/PCI) - single card
# si: Specialix SI/XIO 4-32 port terminal multiplexor
+# cmx: OmniKey CardMan 4040 pccard smartcard reader
# Notes on the Comtrol Rocketport driver:
#
@@ -2170,6 +2171,7 @@ options SI_DEBUG
hint.si.0.at="isa"
hint.si.0.maddr="0xd0000"
hint.si.0.irq="12"
+device cmx
#
# The 'bktr' device is a PCI video capture device using the Brooktree
diff --git a/sys/conf/files b/sys/conf/files
index aa79fd8..f203ed0 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -508,6 +508,8 @@ dev/cardbus/cardbus_cis.c optional cardbus
dev/cardbus/cardbus_device.c optional cardbus
dev/ciss/ciss.c optional ciss
dev/cm/smc90cx6.c optional cm
+dev/cmx/cmx.c optional cmx
+dev/cmx/cmx_pccard.c optional cmx pccard
dev/cnw/if_cnw.c optional cnw pccard
dev/cpufreq/ichss.c optional cpufreq
dev/cs/if_cs.c optional cs
OpenPOWER on IntegriCloud