--- src/sys/i386/conf/Attic/GENERIC	2006/05/11 08:23:20	1.33
+++ src/sys/i386/conf/Attic/GENERIC	2006/05/18 13:51:45	1.34
@@ -214,20 +214,24 @@ device		ep
 device		fe0	at isa? disable port 0x300
 # Xircom Ethernet
 device		xe
-# Generic 802.11 stack, used by wi
-device		wlan
-# PRISM I IEEE 802.11b wireless NIC.
-device		awi
-# WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
-# exists only as a PCMCIA device, so there is no ISA attachment needed
-# and resources will always be dynamically assigned by the pccard code.
-device		wi
-# Aironet 4500/4800 802.11 wireless NICs. Note: the declaration below will
+
+# Wireless NIC cards
+device		wlan		# 802.11 support
+device		wlan_ccmp	# 802.11 CCMP support
+device		wlan_tkip	# 802.11 TKIP support
+device		wlan_wep	# 802.11 WEP support
+# Aironet 4500/4800 802.11 wireless NICs.  Note: the declaration below will
 # work for PCMCIA and PCI cards, as well as ISA cards set to ISA PnP
 # mode (the factory default). If you set the switches on your ISA
 # card for a manually chosen I/O address and IRQ, you must specify
 # those parameters here.
 device		an
+#device		awi		# PRISM I IEEE 802.11b wireless NIC
+# WaveLAN/IEEE 802.11 wireless NICs.  Note: the WaveLAN/IEEE really
+# exists only as a PCMCIA device, so there is no ISA attachment needed
+# and resources will always be dynamically assigned by the pccard code.
+device		wi
+
 # The probe order of these is presently determined by i386/isa/isa_compat.c.
 device		ie0	at isa? disable port 0x300 irq 10 iomem 0xd0000
 #device		le0	at isa? disable port 0x300 irq 5 iomem 0xd0000