[src/netbsd-1-5]: src/sys/arch/i386/conf Pull up revision 1.29 (partial, via ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/61113d0c18eb
branches:  netbsd-1-5
changeset: 491579:61113d0c18eb
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:56:23 2001 +0000

description:
Pull up revision 1.29 (partial, via patch, requested by he):
  Add pseudo-device vlan, and an* at pcmcia.

diffstat:

 sys/arch/i386/conf/CARDBUS |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r ad41eedd00c9 -r 61113d0c18eb sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS        Tue May 01 15:55:56 2001 +0000
+++ b/sys/arch/i386/conf/CARDBUS        Tue May 01 15:56:23 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CARDBUS,v 1.14.2.6 2001/04/25 08:58:05 he Exp $
+#      $NetBSD: CARDBUS,v 1.14.2.7 2001/05/01 15:56:23 he Exp $
 #
 #      CARDBUS -- GENERIC + CardBus support
 #      from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
@@ -560,6 +560,7 @@
 tr*    at isapnp?                      # IBM/3COM TROPIC Token-Ring
 
 # PCMCIA network interfaces
+an*    at pcicma? function ?           # Aironet PC4500/PC4800 (802.11)
 awi*   at pcmcia? function ?           # BayStack 650/660 (802.11FH/DS)
 cnw*   at pcmcia? function ?           # Xircom/Netwave AirSurfer
 ep*    at pcmcia? function ?           # 3Com 3c589 and 3c562 Ethernet
@@ -838,6 +839,7 @@
 pseudo-device  gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device faith           1       # IPv[46] tcp relay translation i/f
 #pseudo-device stf             1       # 6to4 IPv6 over IPv4 encapsulation
+pseudo-device  vlan                    # IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
 pseudo-device  pty             64      # pseudo-terminals