I shortened these names ON PURPOSE. Do NOT make them long again!

1 files changed, 33 insertions, 33 deletions

diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs
index 3cc2c3a6e97..d34ec50e6b8 100644
--- a/sys/dev/pcmcia/pcmciadevs
+++ b/sys/dev/pcmcia/pcmciadevs
@@ -1,4 +1,4 @@
-	$OpenBSD: pcmciadevs,v 1.26 1999/11/05 04:34:21 angelos Exp $
+	$OpenBSD: pcmciadevs,v 1.27 1999/11/06 04:08:47 deraadt Exp $
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
 /*
@@ -57,14 +57,14 @@ vendor COMPAQ			0x0138	Compaq
 vendor LINKSYS			0x0149	Linksys
 vendor SIMPLETECH		0x014d	Simple Technology
 vendor SYMBOL			0x014d	Symbol
-vendor LUCENT			0x0156	Lucent Technologies
+vendor LUCENT			0x0156	Lucent
 vendor COMPAQ2			0x0183	Compaq
 vendor KINGSTON			0x0186	Kingston
 vendor DAYNA			0x0194	Dayna
 vendor BAY                      0x01eb  Bay Networks
 vendor IODATA			0x01bf	I-O DATA
 vendor BREEZECOM		0x0a02	BreezeCOM
-vendor LASAT			0x3401	Lasat Communications A/S
+vendor LASAT			0x3401	Lasat
 vendor COMPEX			0x8a01	Compex
 vendor CONTEC			0xc001	Contec
 vendor COREGA			0xc00f	Corega K.K.
@@ -75,8 +75,8 @@ vendor HAGIWARASYSCOM		0xc012	Hagiwara SYS-COM
  * List of known products.  Grouped by vendor.
  */
 /* Adaptec */
-product ADAPTEC APA1460_1	0x0001 Adaptec APA-1460/A SCSI Host Adapter
-product ADAPTEC APA1460_2	0x0002 Adaptec APA-1460/B SCSI Host Adapter
+product ADAPTEC APA1460_1	0x0001 Adaptec APA-1460/A
+product ADAPTEC APA1460_2	0x0002 Adaptec APA-1460/B
 
 /* Allied Telesis K.K. */
 product ALLIEDTELESIS LA_PCM	0x0002 Allied Telesis LA-PCM
@@ -85,17 +85,17 @@ product ALLIEDTELESIS LA_PCM	0x0002 Allied Telesis LA-PCM
 product BREEZECOM BREEZENET	0x0102 BreezeCOM BreezeNET IEEE 802.11 FHSS
 
 /* 3COM */
-product 3COM 3CXEM556B		0x003d 3Com/Megahertz 3CXEM556B-INT Ethernet/Modem
-product 3COM 3CXEM556		0x0035 3Com/Megahertz 3CXEM556 Ethernet/Modem
-product 3COM 3C562		0x0562 3Com 3c562 33.6 Modem/10Mbps Ethernet
-product 3COM 3C589		0x0589 3Com 3c589 10Mbps Ethernet
-product 3COM 3C574		0x0574 3Com 3c574-TX 10/100Mbps Ethernet
+product 3COM 3CXEM556B		0x003d 3Com 3CXEM556B-INT
+product 3COM 3CXEM556		0x0035 3Com 3CXEM556
+product 3COM 3C562		0x0562 3Com 3c562
+product 3COM 3C589		0x0589 3Com 3c589
+product 3COM 3C574		0x0574 3Com 3c574-TX
 
 /* Contec C-NET(PC) */
 product CONTEC CNETPC		0x0000 Contec C-NET(PC)C
 
 /* Compex */
-product COMPEX AMP_WIRELESS	0x0066 AMP Wireless
+product COMPEX AMP_WIRELESS	0x0066 AMP
 product COMPEX LINKPORT_ENET_B	0x0100 Compex Linkport ENET-B
 
 /* Dayna */
@@ -106,7 +106,7 @@ product DAYNA COMMUNICARD_E_2	0x002f Dayna CommuniCard E
 product DIGITAL MOBILE_MEDIA_CDROM 0x0d00 Digital Mobile Media CD-ROM
 
 /* Fujitsu */
-product FUJITSU SCSI600		0x0401 Fujitsu SCSI 600
+product FUJITSU SCSI600		0x0401 Fujitsu 600
 product FUJITSU LA501		0x2000 Fujitsu Towa LA501
 
 /* Motorola */
@@ -117,9 +117,9 @@ product MOTOROLA MONTANA_336	0x0505 Motorola Montana 33.6
 /* IBM */
 product IBM INFOMOVER		0x0002 National Semiconductor InfoMover
 product IBM PORTABLE_CDROM_DRIVE 0x002d PCMCIA Portable CD-ROM Drive
-product IBM HOME_AND_AWAY	0x002e IBM Home and Away Modem
+product IBM HOME_AND_AWAY	0x002e IBM Home&Away
 product IBM WIRELESS_LAN_ENTRY	0x0032 Wireless LAN Entry 
-product IBM ETHERJET_PCCARD	0x003f IBM EtherJet Ethernet PC Card
+product IBM ETHERJET_PCCARD	0x003f IBM EtherJet
 
 /* I-O DATA */
 product IODATA PCLAT		0x2216 I-O DATA PCLA/T
@@ -131,10 +131,10 @@ product INTEL EEPRO100		0x010a Intel EtherExpress PRO/100
 product KINGSTON KNE_PC2	0x0100 Kingston KNE-PC2
 
 /* Lasat */
-product LASAT CREDIT_288	0x2811 Lasat Credit 288 Modem
+product LASAT CREDIT_288	0x2811 Lasat Credit 288
 
 /* Linksys corporation */
-product LINKSYS TRUST_COMBO_ECARD 0x021b Trust (Linksys) Combo EthernetCard
+product LINKSYS TRUST_COMBO_ECARD 0x021b Trust (Linksys)
 product LINKSYS FAST_ECARD	0x0230 D-Link DFE-650 or Netgear FA410TX
 product LINKSYS ECARD_1		0x0265 Linksys EthernetCard or D-Link DE-650
 product LINKSYS COMBO_ECARD	0xc1ab Linksys Combo EthernetCard
@@ -143,14 +143,14 @@ product LINKSYS COMBO_ECARD	0xc1ab Linksys Combo EthernetCard
 product LUCENT WAVELAN		0x0002 Lucent WaveLAN IEEE 802.11 DSSS
 
 /* BayStack 650 FH 802.11 */
-product	BAY STACK_650		0x0804 BayStack 650 Wireless LAN
+product	BAY STACK_650		0x0804 BayStack 650
 
 /* Megahertz */
-product MEGAHERTZ XJ4288	0x0023 Megahertz XJ4288 Modem
-product MEGAHERTZ XJ5560	0x0034 Megahertz X-JACK 56kbps Modem
-product MEGAHERTZ2 XJEM1144	0x0101 Megahertz X-JACK Ethernet Modem
-product MEGAHERTZ2 XJACK	0x0103 Megahertz X-JACK Ethernet
-product MEGAHERTZ XJEM3336 	0x0006 Megahertz X-JACK Ethernet Modem
+product MEGAHERTZ XJ4288	0x0023 Megahertz XJ4288
+product MEGAHERTZ XJ5560	0x0034 Megahertz X-JACK 56kbps
+product MEGAHERTZ2 XJEM1144	0x0101 Megahertz X-JACK
+product MEGAHERTZ2 XJACK	0x0103 Megahertz X-JACK
+product MEGAHERTZ XJEM3336 	0x0006 Megahertz X-JACK
 
 /* Proxim */
 product PROXIM ROAMABOUT_2400FH	0x1058 Digital RoamAbout 2400FH
@@ -160,7 +160,7 @@ product PROXIM RANGELAN2_7401	0x1158 Proxim RangeLAN2 7401
 product QUATECH DSP_225		0x0008 Quatech Dual Serial Port
 
 /* US Robotics */
-product USROBOTICS WORLDPORT144	0x3330 US Robotics WorldPort 14.4 Modem
+product USROBOTICS WORLDPORT144	0x3330 US Robotics WorldPort 14.4
 
 /* Sandisk */
 product SANDISK SDCFB		0x0401 Sandisk CompactFlash Card
@@ -171,14 +171,14 @@ product SIMPLETECH COMMUNICATOR288 0x0100 Simple Technology 28.8 Communicator
 /* Socket Communications */
 product SOCKET PAGECARD		0x0003 Socket Communications PageCard
 product SOCKET DUAL_RS232	0x0006 Socket Communications Dual RS232
-product SOCKET LP_ETHER_CF	0x0075 Socket Communications Low Power Ethernet CF
+product SOCKET LP_ETHER_CF	0x0075 Socket Communications LP CF
 
 /* Symbol */
 product SYMBOL SPECTRUM24	0x0801 Spectrum24 WLAN IEEE 802.11 FHSS
 
 /* TDK */
-product TDK LAK_CD021BX		0x0200 TDK LAK-CD021BX Ethernet
-product TDK DFL9610		0x0d0a TDK DFL9610 Ethernet & Digital Cellular
+product TDK LAK_CD021BX		0x0200 TDK LAK-CD021BX
+product TDK DFL9610		0x0d0a TDK DFL9610
 
 /* Xircom */
 product XIRCOM XIR_CE_10	0x0108 Xircom CE10
@@ -189,26 +189,26 @@ product XIRCOM XIR_CEM_28	0x110b Xircom CEM-28
 
 /* NewMedia */
 product NEWMEDIA BASICS		0x0019 NewMedia BASICS
-product NEWMEDIA MULTIMEDIA	0x100b NewMedia Multimedia Sound/SCSI
-product NEWMEDIA BUSTOASTER	0xc102 NewMedia BusToaster SCSI
+product NEWMEDIA MULTIMEDIA	0x100b NewMedia Multimedia
+product NEWMEDIA BUSTOASTER	0xc102 NewMedia BusToaster
 
 /* Standard Microsystems Corporation */
-product SMC 8016		0x0105 SMC 8016 EtherCard
+product SMC 8016		0x0105 SMC 8016
 product SMC 8020		0x0001 SMC EtherEZ 8020
-product SMC EZCARD		0x8022 SMC EXCard 10 PCMCIA
+product SMC EZCARD		0x8022 SMC EXCard
 
 /* Cards we know only by their cis */
 vendor PREMAX			-1 	Premax
 vendor PLANET			-1 	Planet
-vendor PLANEX			-1	Planex Communications Inc
+vendor PLANEX			-1	Planex
 vendor DLINK			-1 	D-Link
 vendor RPTI			-1 	RPTI
 vendor ACCTON			-1 	ACCTON
 vendor YEDATA			-1 	Y-E DATA
 vendor DIGITAL			-1 	Digital
 vendor TEAC			-1	TEAC
-vendor SVEC			-1	SVEC/Hawking Technology
-vendor AMBICOM			-1	AmbiCom Inc
+vendor SVEC			-1	SVEC/Hawking
+vendor AMBICOM			-1	AmbiCom
 
 product MEGAHERTZ XJ2288	{ "MEGAHERTZ", "MODEM&spXJ2288", NULL, NULL } Megahertz XJ2288 Modem
 product PREMAX PE200		{ "PMX&sp&sp&sp", "PE-200", NULL, NULL } PreMax PE-200