diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-12-13 23:07:32 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-12-13 23:07:32 +0000 |
| commit | 7f9e1f5478953fdb1f3af13319477c206ac68923 (patch) | |
| tree | 2e5f12e9a5aa32091d7ccb39eea21e4e3c31d3b1 /sys | |
| parent | e3c82b5beb91e4409ddaeaa70e6f4ed2dbe0eca8 (diff) | |
add novatel NRM6831; from Felix Kronlage <fkr@hazardous.org>
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pcmcia/com_pcmcia.c | 3 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmciadevs | 4 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmciadevs.h | 7 |
3 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c index c9b7a549b35..ee3327a5364 100644 --- a/sys/dev/pcmcia/com_pcmcia.c +++ b/sys/dev/pcmcia/com_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_pcmcia.c,v 1.43 2005/11/21 18:16:41 millert Exp $ */ +/* $OpenBSD: com_pcmcia.c,v 1.44 2005/12/13 23:07:31 mickey Exp $ */ /* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */ /* @@ -141,6 +141,7 @@ struct com_pcmcia_product { char *cis1_info[4]; } com_pcmcia_prod[] = { { PCMCIA_CIS_MEGAHERTZ_XJ2288 }, + { PCMCIA_CIS_NOVATEL_NRM6831 }, }; int com_pcmcia_match(struct device *, void *, void *); diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs index c6529db9fa3..372e921ae49 100644 --- a/sys/dev/pcmcia/pcmciadevs +++ b/sys/dev/pcmcia/pcmciadevs @@ -1,4 +1,4 @@ - $OpenBSD: pcmciadevs,v 1.125 2005/12/05 18:06:16 fgsch Exp $ + $OpenBSD: pcmciadevs,v 1.126 2005/12/13 23:06:47 mickey Exp $ /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */ /* @@ -421,6 +421,7 @@ vendor GEMTEK -1 GEMTEK vendor GVC -1 GVC vendor ICOM -1 ICOM Inc vendor INTERSIL -1 Intersil +vendor NOVATEL -1 Novatel vendor PLANET -1 Planet vendor PLANEX -1 Planex vendor PREMAX -1 Premax @@ -517,3 +518,4 @@ 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 } +product NOVATEL NRM6831 { "Novatel&spWireless", "Merlin&spUMTS&spModem", "NRM6831", NULL } diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h index 1bc9fe58d22..1725da8e8f3 100644 --- a/sys/dev/pcmcia/pcmciadevs.h +++ b/sys/dev/pcmcia/pcmciadevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: pcmciadevs.h,v 1.128 2005/12/05 18:06:36 fgsch Exp $ */ +/* $OpenBSD: pcmciadevs.h,v 1.129 2005/12/13 23:07:31 mickey Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcmciadevs,v 1.125 2005/12/05 18:06:16 fgsch Exp + * OpenBSD: pcmciadevs,v 1.126 2005/12/13 23:06:47 mickey Exp */ /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */ @@ -586,6 +586,7 @@ #define PCMCIA_VENDOR_GVC -1 /* GVC */ #define PCMCIA_VENDOR_ICOM -1 /* ICOM Inc */ #define PCMCIA_VENDOR_INTERSIL -1 /* Intersil */ +#define PCMCIA_VENDOR_NOVATEL -1 /* Novatel */ #define PCMCIA_VENDOR_PLANET -1 /* Planet */ #define PCMCIA_VENDOR_PLANEX -1 /* Planex */ #define PCMCIA_VENDOR_PREMAX -1 /* Premax */ @@ -756,3 +757,5 @@ #define PCMCIA_PRODUCT_ALLIEDTELESIS_WR211PCM PCMCIA_PRODUCT_INVALID #define PCMCIA_CIS_BILLIONTON_CFLT2 { "CF", "10Base-Ethernet", NULL, NULL } #define PCMCIA_PRODUCT_BILLIONTON_CFLT2 PCMCIA_PRODUCT_INVALID +#define PCMCIA_CIS_NOVATEL_NRM6831 { "Novatel Wireless", "Merlin UMTS Modem", "NRM6831", NULL } +#define PCMCIA_PRODUCT_NOVATEL_NRM6831 PCMCIA_PRODUCT_INVALID |