summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>1999-11-29 20:53:36 +0000
committerimp <imp@FreeBSD.org>1999-11-29 20:53:36 +0000
commitf431f7be50b836c01bc711272ccad3b5314ec132 (patch)
tree6c3f3a87dbf1dc04d74cccdb54f83d32bd272a17
parent70250fd70ac2d05e56947ff5ffb0548fc9a039c3 (diff)
downloadFreeBSD-src-f431f7be50b836c01bc711272ccad3b5314ec132.zip
FreeBSD-src-f431f7be50b836c01bc711272ccad3b5314ec132.tar.gz
Merge NetBSD 1.60 by jun:
Support for TDK LAC-CF010 by Ichiro Fukuhara (ichiro@ichiro.org) on kern/8900 ichiro test TDK CF Card on Opensource matsuri,tokyo and send patch to us. thanx.
-rw-r--r--sys/dev/pccard/pccarddevs3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs
index 4dbd495..917d30a 100644
--- a/sys/dev/pccard/pccarddevs
+++ b/sys/dev/pccard/pccarddevs
@@ -1,5 +1,5 @@
$FreeBSD$
-/* $NetBSD: pcmciadevs,v 1.59 1999/11/27 01:03:18 soren Exp $ */
+/* $NetBSD: pcmciadevs,v 1.60 1999/11/29 02:28:19 jun Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -155,6 +155,7 @@ product SOCEKT LP_ETHER_CF 0x0075 Socket Communications Low Power Ethernet CF
/* TDK Products */
product TDK LAK_CD021BX 0x0200 TDK LAK-CD021BX Ethernet
product TDK DFL9610 0x0d0a TDK DFL9610 Ethernet & Digital Cellular
+product TDK LAK_CF010 0x0900 TDK LAC-CF010
/* TDK Vendor ID also used by Xircom! */
product TDK XIR_CE_10 0x0108 Xircom CreditCard Ethernet
OpenPOWER on IntegriCloud