[Midnightbsd-cvs] src: PAE: Sync with changes to GENERIC and the removal of lnc

[laffer1 at midnightbsd.org]

Log Message:
-----------
Sync with changes to GENERIC and the removal of lnc

Modified Files:
--------------
    src/sys/i386/conf:
        PAE (r1.4 -> r1.5)

-------------- next part --------------
Index: PAE
===================================================================
RCS file: /home/cvs/src/sys/i386/conf/PAE,v
retrieving revision 1.4
retrieving revision 1.5
diff -L sys/i386/conf/PAE -L sys/i386/conf/PAE -u -r1.4 -r1.5
--- sys/i386/conf/PAE
+++ sys/i386/conf/PAE
@@ -19,6 +19,9 @@
 # the correct options headers.
 makeoptions	NO_MODULES=yes
 
+# force isp firmware to fully loaded
+device		ispfw
+
 # What follows is a list of drivers that are normally in GENERIC, but either
 # don't work or are untested with PAE.  Be very careful before enabling any
 # of these drivers.  Drivers which use DMA and don't handle 64 bit physical
@@ -44,6 +47,7 @@
 nodevice	dpt
 nodevice	mly
 nodevice	hptmv
+nodevice	hptrr
 
 nodevice	ida
 nodevice	mlx
@@ -51,7 +55,6 @@
 
 nodevice	agp
 
-nodevice	de
 nodevice	txp
 nodevice	vx
 
@@ -71,12 +74,20 @@
 nodevice	ep
 nodevice	fe
 nodevice	ie
-nodevice	lnc
 nodevice	sn
 nodevice	xe
 
 nodevice	wlan
+nodevice	wlan_wep	# 802.11 WEP support
+nodevice	wlan_ccmp	# 802.11 CCMP support
+nodevice	wlan_tkip	# 802.11 TKIP support
+nodevice	wlan_amrr	# AMRR transmit rate control algorithm
+nodevice	wlan_scan_ap	# 802.11 AP mode scanning
+nodevice	wlan_scan_sta	# 802.11 STA mode scanning
 nodevice	an
+nodevice	ath		# Atheros pci/cardbus NIC's
+nodevice	ath_hal		# Atheros HAL (Hardware Access Layer)
+nodevice	ath_rate_sample	# SampleRate tx rate control for ath
 nodevice	awi
 nodevice	ral
 nodevice	wi
@@ -93,6 +104,7 @@
 nodevice	ums
 nodevice	ural
 nodevice	urio
+nodevice	rum
 nodevice	uscanner
 nodevice	aue
 nodevice	axe