[PC-BSD Commits] r1254 - pcbsd/trunk/system-overlay/PCBSD/conf

svn at pcbsd.org svn at pcbsd.org
Sat Jan 26 16:21:07 PST 2008


Author: kris
Date: 2008-01-26 16:21:06 -0800 (Sat, 26 Jan 2008)
New Revision: 1254

Modified:
   pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD-SMP.amd64
   pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64
Log:

Fixed up the kernel configs for AMD64 builds to a more specific amd64 setup



Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD-SMP.amd64
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD-SMP.amd64	2008-01-26 20:41:31 UTC (rev 1253)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD-SMP.amd64	2008-01-27 00:21:06 UTC (rev 1254)
@@ -1,5 +1,5 @@
 #
-# GENERIC -- Generic kernel configuration file for FreeBSD/mad64
+# GENERIC -- Generic kernel configuration file for FreeBSD/amd64
 #
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
@@ -16,15 +16,16 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.18.2.1 2007/12/15 06:32:33 scottl Exp $
 
 machine		amd64
 cpu		HAMMER
-ident		PCBSD
+ident		GENERIC
 
 # To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		# Default places to look for devices.
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
@@ -38,23 +39,23 @@
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	NTFS			# NT File System
+options 	NTFS_ICONV		# 
 options 	MSDOSFS			# MSDOS Filesystem
+options 	MSDOSFS_ICONV		# 
 options 	CD9660			# ISO 9660 Filesystem
-options		LIBICONV
-options		LIBMCHAIN
-options		CD9660_ICONV
-options		MSDOSFS_ICONV
-options		NTFS
-options		NTFS_ICONV
-options		UDF
-options		UDF_ICONV
+options 	CD9660_ICONV	        # 	
+options 	UDF			# ISO 9660 Filesystem
+options 	UDF_ICONV	        # 	
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_GPT		# GUID Partition Tables.
-options		GEOM_UZIP		# Read-only compressed disks
-options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
+options 	GEOM_UZIP		# Compressed FS support
+options 	COMPAT_43		# Needed by COMPAT_LINUX32
+options 	COMPAT_IA32		# Compatible with i386 binaries
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
+options 	COMPAT_LINUX32		# Compatible with i386 linux binaries 
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	SYSVSHM			# SYSV-style shared memory
@@ -62,17 +63,16 @@
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~128k to driver.
-options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~215k to driver.
 options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
 
-#device		apic			# I/O APIC
+# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
+device		atpic			# 8259A compatability
 
+# Linux 32-bit ABI support
+options 	LINPROCFS		# Cannot be a module yet.
+
 # Bus support.
-#device		isa
-#device		eisa
+device		acpi
 device		pci
 
 # Floppy drives
@@ -85,13 +85,16 @@
 device		atapicd		# ATAPI CDROM drives
 device		atapifd		# ATAPI floppy drives
 device		atapist		# ATAPI tape drives
+device		atapicam	# Cam control support
 #options 	ATA_STATIC_ID	# Static device numbering
-device		atapicam	# Atapi CAM Support
 
 # SCSI Controllers
-device		ahb		# EISA AHA1742 family
 device		ahc		# AHA2940 and onboard AIC7xxx devices
+options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~128k to driver.
 device		ahd		# AHA39320/29320 and onboard AIC79xx devices
+options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~215k to driver.
 device		amd		# AMD 53C974 (Tekram DC-390(T))
 device		isp		# Qlogic family
 #device 	ispfw		# Firmware for QLogic HBAs- normally a module
@@ -102,13 +105,9 @@
 
 device		adv		# Advansys SCSI adapters
 device		adw		# Advansys wide SCSI adapters
-device		aha		# Adaptec 154x SCSI adapters
 device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
 device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
 
-device		ncv		# NCR 53C500
-device		nsp		# Workbit Ninja SCSI-3
-device		stg		# TMC 18C30/18C50
 
 # SCSI peripherals
 device		scbus		# SCSI bus (required for SCSI)
@@ -122,10 +121,10 @@
 # RAID controllers interfaced to the SCSI subsystem
 device		amr		# AMI MegaRAID
 device		arcmsr		# Areca SATA II RAID
-device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
 device		ciss		# Compaq Smart RAID 5*
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
 device		hptmv		# Highpoint RocketRAID 182x
+device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
 device		rr232x		# Highpoint RocketRAID 232x
 device		iir		# Intel Integrated RAID
 device		ips		# IBM (Adaptec) ServeRAID
@@ -138,6 +137,7 @@
 device		ida		# Compaq Smart RAID
 device		mfi		# LSI MegaRAID SAS
 device		mlx		# Mylex DAC960 family
+#XXX pointer/int warnings
 #device		pst		# Promise Supertrak SX6000
 device		twe		# 3ware ATA RAID
 
@@ -155,18 +155,8 @@
 # syscons is the default console driver, resembling an SCO console
 device		sc
 
-# Enable this for the pcvt (VT220 compatible) console driver
-#device		vt
-#options 	XSERVER		# support for X server on a vt console
-#options 	FAT_CURSOR	# start with block cursor
-
 device		agp		# support several AGP chipsets
 
-# Power management support (see NOTES for more options)
-#device		apm
-# Add suspend/resume support for the i8254.
-#device		pmtimer
-
 # PCCARD (PCMCIA) support
 # PCMCIA and cardbus bridge support
 device		cbb		# cardbus (yenta) bridge
@@ -193,6 +183,7 @@
 device		de		# DEC/Intel DC21x4x (``Tulip'')
 device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
 device		ixgb		# Intel PRO/10GbE Ethernet Card
+device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
 device		txp		# 3Com 3cR990 (``Typhoon'')
 device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
@@ -205,16 +196,16 @@
 device		dc		# DEC/Intel 21143 and various workalikes
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 device		lge		# Level 1 LXT1001 gigabit Ethernet
+device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
 device		nge		# NatSemi DP83820 gigabit Ethernet
-#device		nve		# nVidia nForce MCP on-board Ethernet Networking
-device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
+device		nve		# nVidia nForce MCP on-board Ethernet Networking
+device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
 device		sf		# Adaptec AIC-6915 (``Starfire'')
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
-device          stge            # Sundance/Tamarack TC9021 gigabit Ethernet
 device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		tl		# Texas Instruments ThunderLAN
 device		tx		# SMC EtherPower II (83c170 ``EPIC'')
@@ -230,29 +221,22 @@
 device		ex		# Intel EtherExpress Pro/10 and Pro/10+
 device		ep		# Etherlink III based cards
 device		fe		# Fujitsu MB8696x based cards
-#device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
-#device		lnc		# NE2100, NE32-VL Lance Ethernet cards
 device		sn		# SMC's 9000 series of Ethernet chips
 device		xe		# Xircom pccard Ethernet
 
 # Wireless NIC cards
-device          wlan            # 802.11 support
-device          wlan_wep        # 802.11 WEP support
-device          wlan_ccmp       # 802.11 CCMP support
-device          wlan_tkip       # 802.11 TKIP support
-device          an              # Aironet 4500/4800 802.11 wireless NICs.
-device          ath             # Atheros pci/cardbus NIC's
-device          ath_hal         # Atheros HAL (Hardware Access Layer)
-device          ath_rate_sample # SampleRate tx rate control for ath
-device          awi             # BayStack 660 and others
-device          ral             # Ralink Technology RT2500 wireless NICs.
-device          wi              # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-#device		wl		# Older non 802.11 Wavelan wireless NIC.
-device          iwi             # Intel Wireless Adapters
-device          ipw             # Intel Wireless Adapters
-device          firmware        # Loads intel firmware for wireless
+device		wlan		# 802.11 support
+device		wlan_wep	# 802.11 WEP support
+device		wlan_ccmp	# 802.11 CCMP support
+device		wlan_tkip	# 802.11 TKIP support
+device		an		# Aironet 4500/4800 802.11 wireless NICs.
+device		ath		# Atheros pci/cardbus NIC's
+device		ath_hal		# Atheros HAL (Hardware Access Layer)
+device		ath_rate_sample	# SampleRate tx rate control for ath
+device		awi		# BayStack 660 and others
+device		ral		# Ralink Technology RT2500 wireless NICs.
+device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 
-
 # Pseudo devices.
 device		loop		# Network loopback
 device		random		# Entropy device
@@ -279,7 +263,7 @@
 device		ugen		# Generic
 device		uhid		# "Human Interface Devices"
 device		ukbd		# Keyboard
-#device		ulpt		# Printer
+device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
 device		ural		# Ralink Technology RT2500USB wireless NICs
@@ -298,35 +282,17 @@
 device		sbp		# SCSI over FireWire (Requires scbus and da)
 device		fwe		# Ethernet over FireWire (non-standard!)
 
+device          pf
+device          pflog
+device          pfsync
 
-# Direct Rendering modules for 3d accelleration
-#device 		drm		# DRM Core Module
-#device 		mach64drm	# ATI Rage Pro
-#device		mgadrm		# AGP Matrox G200
-#device		r128drm         # ATI Rage 128
-#device		radeondrm       # ATI Radeon
-#device		sisdrm		# SIS 300/305
-#device		i915drm		# Intel i830 through i915
-#device		savagedrm	# S3 Savage 3D, Savage 4
-#device		tdfxdrm		# 3dfx Voodoo 3/4/5 and Banshee
+options         ALTQ
+options         ALTQ_CBQ
+options         ALTQ_RED
+options         ALTQ_RIO
+options         ALTQ_HFSC
+options         ALTQ_CDNR
+options         ALTQ_PRIQ
+options         ALTQ_NOPCC
 
-#options 	VESA		# Vesa Support for Splash
-#options		SC_PIXEL_MODE	# add support for the raster tex
-
-options 	HZ=1000
-options 	DEVICE_POLLING
-
-device 		pf
-device 		pflog
-device 		pfsync
-
-options		ALTQ
-options		ALTQ_CBQ
-options		ALTQ_RED
-options		ALTQ_RIO
-options		ALTQ_HFSC
-options		ALTQ_CDNR
-options		ALTQ_PRIQ
-options		ALTQ_NOPCC
-
-options		SMP
+options 	SMP

Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64	2008-01-26 20:41:31 UTC (rev 1253)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64	2008-01-27 00:21:06 UTC (rev 1254)
@@ -16,15 +16,16 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.18.2.1 2007/12/15 06:32:33 scottl Exp $
 
 machine		amd64
 cpu		HAMMER
-ident		PCBSD
+ident		GENERIC
 
 # To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		# Default places to look for devices.
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
@@ -38,23 +39,23 @@
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	NTFS			# NT File System
+options 	NTFS_ICONV		# 
 options 	MSDOSFS			# MSDOS Filesystem
+options 	MSDOSFS_ICONV		# 
 options 	CD9660			# ISO 9660 Filesystem
-options		LIBICONV
-options		LIBMCHAIN
-options		CD9660_ICONV
-options		MSDOSFS_ICONV
-options		NTFS
-options		NTFS_ICONV
-options		UDF
-options		UDF_ICONV
+options 	CD9660_ICONV	        # 	
+options 	UDF			# ISO 9660 Filesystem
+options 	UDF_ICONV	        # 	
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_GPT		# GUID Partition Tables.
-options		GEOM_UZIP		# Read-only compressed disks
-options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
+options 	GEOM_UZIP		# Compressed FS support
+options 	COMPAT_43		# Needed by COMPAT_LINUX32
+options 	COMPAT_IA32		# Compatible with i386 binaries
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
+options 	COMPAT_LINUX32		# Compatible with i386 linux binaries 
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	SYSVSHM			# SYSV-style shared memory
@@ -62,17 +63,16 @@
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~128k to driver.
-options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~215k to driver.
 options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
 
-#device		apic			# I/O APIC
+# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
+device		atpic			# 8259A compatability
 
+# Linux 32-bit ABI support
+options 	LINPROCFS		# Cannot be a module yet.
+
 # Bus support.
-#device		isa
-#device		eisa
+device		acpi
 device		pci
 
 # Floppy drives
@@ -85,13 +85,16 @@
 device		atapicd		# ATAPI CDROM drives
 device		atapifd		# ATAPI floppy drives
 device		atapist		# ATAPI tape drives
+device		atapicam	# Cam control support
 #options 	ATA_STATIC_ID	# Static device numbering
-device		atapicam	# Atapi CAM Support
 
 # SCSI Controllers
-device		ahb		# EISA AHA1742 family
 device		ahc		# AHA2940 and onboard AIC7xxx devices
+options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~128k to driver.
 device		ahd		# AHA39320/29320 and onboard AIC79xx devices
+options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~215k to driver.
 device		amd		# AMD 53C974 (Tekram DC-390(T))
 device		isp		# Qlogic family
 #device 	ispfw		# Firmware for QLogic HBAs- normally a module
@@ -102,13 +105,9 @@
 
 device		adv		# Advansys SCSI adapters
 device		adw		# Advansys wide SCSI adapters
-device		aha		# Adaptec 154x SCSI adapters
 device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
 device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
 
-device		ncv		# NCR 53C500
-device		nsp		# Workbit Ninja SCSI-3
-device		stg		# TMC 18C30/18C50
 
 # SCSI peripherals
 device		scbus		# SCSI bus (required for SCSI)
@@ -122,10 +121,10 @@
 # RAID controllers interfaced to the SCSI subsystem
 device		amr		# AMI MegaRAID
 device		arcmsr		# Areca SATA II RAID
-device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
 device		ciss		# Compaq Smart RAID 5*
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
 device		hptmv		# Highpoint RocketRAID 182x
+device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
 device		rr232x		# Highpoint RocketRAID 232x
 device		iir		# Intel Integrated RAID
 device		ips		# IBM (Adaptec) ServeRAID
@@ -138,6 +137,7 @@
 device		ida		# Compaq Smart RAID
 device		mfi		# LSI MegaRAID SAS
 device		mlx		# Mylex DAC960 family
+#XXX pointer/int warnings
 #device		pst		# Promise Supertrak SX6000
 device		twe		# 3ware ATA RAID
 
@@ -155,18 +155,8 @@
 # syscons is the default console driver, resembling an SCO console
 device		sc
 
-# Enable this for the pcvt (VT220 compatible) console driver
-#device		vt
-#options 	XSERVER		# support for X server on a vt console
-#options 	FAT_CURSOR	# start with block cursor
-
 device		agp		# support several AGP chipsets
 
-# Power management support (see NOTES for more options)
-#device		apm
-# Add suspend/resume support for the i8254.
-#device		pmtimer
-
 # PCCARD (PCMCIA) support
 # PCMCIA and cardbus bridge support
 device		cbb		# cardbus (yenta) bridge
@@ -193,6 +183,7 @@
 device		de		# DEC/Intel DC21x4x (``Tulip'')
 device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
 device		ixgb		# Intel PRO/10GbE Ethernet Card
+device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
 device		txp		# 3Com 3cR990 (``Typhoon'')
 device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
@@ -205,16 +196,16 @@
 device		dc		# DEC/Intel 21143 and various workalikes
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 device		lge		# Level 1 LXT1001 gigabit Ethernet
+device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
 device		nge		# NatSemi DP83820 gigabit Ethernet
-#device		nve		# nVidia nForce MCP on-board Ethernet Networking
-device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
+device		nve		# nVidia nForce MCP on-board Ethernet Networking
+device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
 device		sf		# Adaptec AIC-6915 (``Starfire'')
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
-device          stge            # Sundance/Tamarack TC9021 gigabit Ethernet
 device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		tl		# Texas Instruments ThunderLAN
 device		tx		# SMC EtherPower II (83c170 ``EPIC'')
@@ -230,29 +221,22 @@
 device		ex		# Intel EtherExpress Pro/10 and Pro/10+
 device		ep		# Etherlink III based cards
 device		fe		# Fujitsu MB8696x based cards
-#device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
-#device		lnc		# NE2100, NE32-VL Lance Ethernet cards
 device		sn		# SMC's 9000 series of Ethernet chips
 device		xe		# Xircom pccard Ethernet
 
 # Wireless NIC cards
-device          wlan            # 802.11 support
-device          wlan_wep        # 802.11 WEP support
-device          wlan_ccmp       # 802.11 CCMP support
-device          wlan_tkip       # 802.11 TKIP support
-device          an              # Aironet 4500/4800 802.11 wireless NICs.
-device          ath             # Atheros pci/cardbus NIC's
-device          ath_hal         # Atheros HAL (Hardware Access Layer)
-device          ath_rate_sample # SampleRate tx rate control for ath
-device          awi             # BayStack 660 and others
-device          ral             # Ralink Technology RT2500 wireless NICs.
-device          wi              # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-#device		wl		# Older non 802.11 Wavelan wireless NIC.
-device          iwi             # Intel Wireless Adapters
-device          ipw             # Intel Wireless Adapters
-device          firmware        # Loads intel firmware for wireless
+device		wlan		# 802.11 support
+device		wlan_wep	# 802.11 WEP support
+device		wlan_ccmp	# 802.11 CCMP support
+device		wlan_tkip	# 802.11 TKIP support
+device		an		# Aironet 4500/4800 802.11 wireless NICs.
+device		ath		# Atheros pci/cardbus NIC's
+device		ath_hal		# Atheros HAL (Hardware Access Layer)
+device		ath_rate_sample	# SampleRate tx rate control for ath
+device		awi		# BayStack 660 and others
+device		ral		# Ralink Technology RT2500 wireless NICs.
+device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 
-
 # Pseudo devices.
 device		loop		# Network loopback
 device		random		# Entropy device
@@ -279,7 +263,7 @@
 device		ugen		# Generic
 device		uhid		# "Human Interface Devices"
 device		ukbd		# Keyboard
-#device		ulpt		# Printer
+device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
 device		ural		# Ralink Technology RT2500USB wireless NICs
@@ -298,33 +282,16 @@
 device		sbp		# SCSI over FireWire (Requires scbus and da)
 device		fwe		# Ethernet over FireWire (non-standard!)
 
+device          pf
+device          pflog
+device          pfsync
 
-# Direct Rendering modules for 3d accelleration
-#device		drm		# DRM Core Module
-#device		mach64drm	# ATI Rage Pro
-#device		mgadrm		# AGP Matrox G200
-#device		r128drm         # ATI Rage 128
-#device		radeondrm       # ATI Radeon
-#device		sisdrm		# SIS 300/305
-#device		i915drm		# Intel i830 through i915
-#device		savagedrm	# S3 Savage 3D, Savage 4
-#device		tdfxdrm		# 3dfx Voodoo 3/4/5 and Banshee
+options         ALTQ
+options         ALTQ_CBQ
+options         ALTQ_RED
+options         ALTQ_RIO
+options         ALTQ_HFSC
+options         ALTQ_CDNR
+options         ALTQ_PRIQ
+options         ALTQ_NOPCC
 
-#options 	VESA		# Vesa Support for Splash
-#options	SC_PIXEL_MODE	# add support for the raster tex
-
-options 	HZ=1000
-options 	DEVICE_POLLING
-
-device 		pf
-device 		pflog
-device 		pfsync
-
-options		ALTQ
-options		ALTQ_CBQ
-options		ALTQ_RED
-options		ALTQ_RIO
-options		ALTQ_HFSC
-options		ALTQ_CDNR
-options		ALTQ_PRIQ
-options		ALTQ_NOPCC



More information about the Commits mailing list