summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatthieu <matthieu@openbsd.org>2005-02-07 20:09:42 +0000
committermatthieu <matthieu@openbsd.org>2005-02-07 20:09:42 +0000
commit287692a646f2f7046514630332e4e3b62424faeb (patch)
treedf6e371ba8e8b46fcc0fffcc430bdd8cb6350895
parentregen (diff)
downloadwireguard-openbsd-287692a646f2f7046514630332e4e3b62424faeb.tar.xz
wireguard-openbsd-287692a646f2f7046514630332e4e3b62424faeb.zip
Add Billionton CFLT2 Compact Flash. ok pval@ drahn@.
-rw-r--r--share/man/man4/ne.43
-rw-r--r--sys/dev/pcmcia/if_ne_pcmcia.c6
-rw-r--r--sys/dev/pcmcia/pcmciadevs3
3 files changed, 9 insertions, 3 deletions
diff --git a/share/man/man4/ne.4 b/share/man/man4/ne.4
index fdfc1bbe63f..8035ea698cc 100644
--- a/share/man/man4/ne.4
+++ b/share/man/man4/ne.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ne.4,v 1.20 2004/12/12 07:05:49 deraadt Exp $
+.\" $OpenBSD: ne.4,v 1.21 2005/02/07 20:12:42 matthieu Exp $
.\" $NetBSD: ne.4,v 1.4 1998/02/22 05:21:20 enami Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,6 +68,7 @@ cards, including:
.It Li "AmbiCom AMB8002T" Ta PCMCIA
.It Li "Arowana FE" Ta PCMCIA
.It Li "Belkin F5D5020" Ta PCMCIA
+.It Li "Billionton Systems CFLT2" Ta CF+
.It Li "Billionton Systems LNT-10TN" Ta PCMCIA
.It Li "BUFFALO LPC_CF_CLT" Ta PCMCIA
.It Li "BUFFALO LPC4_CLX" Ta PCMCIA
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index 116e360266d..730ca521e4d 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ne_pcmcia.c,v 1.77 2005/01/27 17:04:55 millert Exp $ */
+/* $OpenBSD: if_ne_pcmcia.c,v 1.78 2005/02/07 20:11:43 matthieu Exp $ */
/* $NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $ */
/*
@@ -212,6 +212,10 @@ const struct ne2000dev {
PCMCIA_CIS_RELIA_RE2408T,
0, -1, { 0x00, 0xc0, 0x0c } },
+ { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+ PCMCIA_CIS_BILLIONTON_CFLT2,
+ 0, -1, { 0x00, 0x10, 0x60 } },
+
/*
* You have to add new entries which contains
* PCMCIA_VENDOR_INVALID and/or PCMCIA_PRODUCT_INVALID
diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs
index 5d4cd3e9fa1..c14de70310c 100644
--- a/sys/dev/pcmcia/pcmciadevs
+++ b/sys/dev/pcmcia/pcmciadevs
@@ -1,4 +1,4 @@
- $OpenBSD: pcmciadevs,v 1.120 2004/12/12 07:05:49 deraadt Exp $
+ $OpenBSD: pcmciadevs,v 1.121 2005/02/07 20:09:42 matthieu Exp $
/* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
/*
@@ -509,3 +509,4 @@ product AROWANA FE { "PCMCIA", "Fast-Ethernet", NULL, NULL }
product GVC NP0335 { "ETHER-C16", "ETHER-C16", "Fast&spEthernet", NULL }
product RELIA RE2408T { "PCMCIA&spLAN", "Ethernet", "A", "004743118001" }
product ALLIEDTELESIS WR211PCM { "Allied&spTelesis&spK.K.", "WR211PCM", NULL, NULL }
+product BILLIONTON CFLT2 { "CF", "10Base-Ethernet", NULL, NULL }