[Glibc-bsd-commits] r3505 - in trunk: kfreebsd-8/debian kfreebsd-8/debian/patches kfreebsd-9/debian kfreebsd-9/debian/patches

Robert Millan rmh at alioth.debian.org
Wed Jun 29 11:11:59 UTC 2011


Author: rmh
Date: 2011-06-29 11:11:59 +0000 (Wed, 29 Jun 2011)
New Revision: 3505

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/control.flavor.in
   trunk/kfreebsd-8/debian/patches/999_config.diff
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/control.flavor.in
   trunk/kfreebsd-9/debian/patches/999_config.diff
Log:
Remove drivers for USB and PCI sound devices from kernel, now that devd autoloads them.

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-06-29 10:36:42 UTC (rev 3504)
+++ trunk/kfreebsd-8/debian/changelog	2011-06-29 11:11:59 UTC (rev 3505)
@@ -5,8 +5,10 @@
     to header package.
   * Require either libsbuf-dev or kfreebsd-kernel-headers that provides
     a valid <sys/sbuf.h>.
+  * Remove drivers for USB devices from kernel, now that devd autoloads
+    them.
 
- -- Robert Millan <rmh at debian.org>  Tue, 28 Jun 2011 18:37:30 +0200
+ -- Robert Millan <rmh at debian.org>  Wed, 29 Jun 2011 13:09:45 +0200
 
 kfreebsd-8 (8.2-3) unstable; urgency=medium
 

Modified: trunk/kfreebsd-8/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-8/debian/control.flavor.in	2011-06-29 10:36:42 UTC (rev 3504)
+++ trunk/kfreebsd-8/debian/control.flavor.in	2011-06-29 11:11:59 UTC (rev 3505)
@@ -1,6 +1,6 @@
 Package: kfreebsd-image- at version@- at abiname@- at flavor@
 Architecture: any- at arch@
-Depends: freebsd-utils (>= 5), kldutils (>= 7.1), ${misc:Depends}
+Depends: freebsd-utils (>= 8.2+ds1-1), kldutils (>= 7.1), ${misc:Depends}
 Conflicts: kfreebsd-loader (<< 5.4-1.3)
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@

Modified: trunk/kfreebsd-8/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_config.diff	2011-06-29 10:36:42 UTC (rev 3504)
+++ trunk/kfreebsd-8/debian/patches/999_config.diff	2011-06-29 11:11:59 UTC (rev 3505)
@@ -20,7 +20,7 @@
  
  # Use the following to compile in values accessible to the kernel
  # through getenv() (or kenv(1) in userland). The format of the file
-@@ -30,7 +30,7 @@ ident		GENERIC
+@@ -30,7 +30,7 @@
  #
  # env		"GENERIC.env"
  
@@ -29,7 +29,7 @@
  
  options 	SCHED_ULE		# ULE scheduler
  options 	PREEMPTION		# Enable kernel thread preemption
-@@ -59,7 +59,7 @@ options 	COMPAT_FREEBSD4		# Compatible w
+@@ -59,7 +59,7 @@
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
  options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
  options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
@@ -38,7 +38,7 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -87,7 +87,7 @@ options 	KDB			# Kernel debugger related
+@@ -87,7 +87,7 @@
  options 	KDB_TRACE		# Print a stack trace for a panic
  
  # Make an SMP-capable kernel by default
@@ -47,7 +47,7 @@
  
  # CPU frequency control
  device		cpufreq
-@@ -96,9 +96,6 @@ device		cpufreq
+@@ -96,9 +96,6 @@
  device		acpi
  device		pci
  
@@ -57,7 +57,7 @@
  # ATA and ATAPI devices
  device		ata
  device		atadisk		# ATA disk drives
-@@ -106,6 +103,8 @@ device		ataraid		# ATA RAID drives
+@@ -106,6 +103,8 @@
  device		atapicd		# ATAPI CDROM drives
  device		atapifd		# ATAPI floppy drives
  device		atapist		# ATAPI tape drives
@@ -66,7 +66,7 @@
  options 	ATA_STATIC_ID	# Static device numbering
  
  # SCSI Controllers
-@@ -125,7 +124,6 @@ device		sym		# NCR/Symbios Logic (newer
+@@ -125,7 +124,6 @@
  device		trm		# Tekram DC395U/UW/F DC315U adapters
  
  device		adv		# Advansys SCSI adapters
@@ -74,7 +74,7 @@
  device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
  device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
  
-@@ -188,10 +186,6 @@ device		uart		# Generic UART driver
+@@ -188,10 +186,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -85,7 +85,7 @@
  
  # If you've got a "dumb" serial or parallel PCI card that is
  # supported by the puc(4) glue driver, uncomment the following
-@@ -204,8 +198,6 @@ device		em		# Intel PRO/1000 Gigabit Eth
+@@ -204,8 +198,6 @@
  device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
  device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
  device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
@@ -94,7 +94,7 @@
  device		vx		# 3Com 3c590, 3c595 (``Vortex'')
  
  # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -215,12 +207,10 @@ device		ae		# Attansic/Atheros L2 FastEt
+@@ -215,12 +207,10 @@
  device		age		# Attansic/Atheros L1 Gigabit Ethernet
  device		alc		# Atheros AR8131/AR8132 Ethernet
  device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@@ -107,7 +107,7 @@
  device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
  device		lge		# Level 1 LXT1001 gigabit Ethernet
  device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -230,7 +220,6 @@ device		nge		# NatSemi DP83820 gigabit E
+@@ -230,7 +220,6 @@
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
@@ -115,7 +115,7 @@
  device		sge		# Silicon Integrated Systems SiS190/191
  device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
  device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -250,7 +239,6 @@ device		ed		# NE[12]000, SMC Ultra, 3c50
+@@ -250,7 +239,6 @@
  device		ex		# Intel EtherExpress Pro/10 and Pro/10+
  device		ep		# Etherlink III based cards
  device		fe		# Fujitsu MB8696x based cards
@@ -123,7 +123,7 @@
  device		xe		# Xircom pccard Ethernet
  
  # Wireless NIC cards
-@@ -275,11 +263,8 @@ device		loop		# Network loopback
+@@ -275,11 +263,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -135,26 +135,43 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -299,7 +284,6 @@ device		ukbd		# Keyboard
- device		ulpt		# Printer
+@@ -293,35 +278,9 @@
+ device		ohci		# OHCI PCI->USB interface
+ device		ehci		# EHCI PCI->USB interface (USB 2.0)
+ device		usb		# USB Bus (required)
+-#device		udbp		# USB Double Bulk Pipe devices
+-device		uhid		# "Human Interface Devices"
+ device		ukbd		# Keyboard
+-device		ulpt		# Printer
  device		umass		# Disks/Mass storage - Requires scbus and da
  device		ums		# Mouse
 -device		urio		# Diamond Rio 500 MP3 player
- # USB Serial devices
- device		uark		# Technologies ARK3116 based serial adapters
- device		ubsa		# Belkin F5U103 and compatible serial adapters
-@@ -318,10 +302,7 @@ device		kue		# Kawasaki LSI USB Ethernet
- device		rue		# RealTek RTL8150 USB Ethernet
- device		udav		# Davicom DM9601E USB
- # USB Wireless
+-# USB Serial devices
+-device		uark		# Technologies ARK3116 based serial adapters
+-device		ubsa		# Belkin F5U103 and compatible serial adapters
+-device		uftdi		# For FTDI usb serial adapters
+-device		uipaq		# Some WinCE based devices
+-device		uplcom		# Prolific PL-2303 serial adapters
+-device		uslcom		# SI Labs CP2101/CP2102 serial adapters
+-device		uvisor		# Visor and Palm devices
+-device		uvscom		# USB serial support for DDI pocket's PHS
+-# USB Ethernet, requires miibus
+-device		aue		# ADMtek USB Ethernet
+-device		axe		# ASIX Electronics USB Ethernet
+-device		cdce		# Generic USB over Ethernet
+-device		cue		# CATC USB Ethernet
+-device		kue		# Kawasaki LSI USB Ethernet
+-device		rue		# RealTek RTL8150 USB Ethernet
+-device		udav		# Davicom DM9601E USB
+-# USB Wireless
 -device		rum		# Ralink Technology RT2501USB wireless NICs
 -device		uath		# Atheros AR5523 wireless NICs
- device		ural		# Ralink Technology RT2500USB wireless NICs
+-device		ural		# Ralink Technology RT2500USB wireless NICs
 -device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -330,3 +311,11 @@ device		fwe		# Ethernet over FireWire (n
+@@ -330,3 +289,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
@@ -187,7 +204,7 @@
  
  # Use the following to compile in values accessible to the kernel
  # through getenv() (or kenv(1) in userland). The format of the file
-@@ -32,7 +32,7 @@ ident		GENERIC
+@@ -32,7 +32,7 @@
  #
  # env		"GENERIC.env"
  
@@ -196,7 +213,7 @@
  
  options 	SCHED_ULE		# ULE scheduler
  options 	PREEMPTION		# Enable kernel thread preemption
-@@ -52,6 +52,8 @@ options 	NFS_ROOT		# NFS usable as /, re
+@@ -52,6 +52,8 @@
  options 	MSDOSFS			# MSDOS Filesystem
  options 	CD9660			# ISO 9660 Filesystem
  options 	PROCFS			# Process filesystem (requires PSEUDOFS)
@@ -205,7 +222,7 @@
  options 	PSEUDOFS		# Pseudo-filesystem framework
  options 	GEOM_PART_GPT		# GUID Partition Tables.
  options 	GEOM_LABEL		# Provides labelization
-@@ -60,7 +62,7 @@ options 	COMPAT_FREEBSD4		# Compatible w
+@@ -60,7 +62,7 @@
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
  options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
  options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
@@ -214,7 +231,7 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -87,7 +89,7 @@ options 	KDB			# Kernel debugger related
+@@ -87,7 +89,7 @@
  options 	KDB_TRACE		# Print a stack trace for a panic
  
  # To make an SMP kernel, the next two lines are needed
@@ -223,7 +240,7 @@
  device		apic			# I/O APIC
  
  # CPU frequency control
-@@ -98,9 +100,6 @@ device		acpi
+@@ -98,9 +100,6 @@
  device		eisa
  device		pci
  
@@ -233,7 +250,7 @@
  # ATA and ATAPI devices
  device		ata
  device		atadisk		# ATA disk drives
-@@ -108,6 +107,8 @@ device		ataraid		# ATA RAID drives
+@@ -108,6 +107,8 @@
  device		atapicd		# ATAPI CDROM drives
  device		atapifd		# ATAPI floppy drives
  device		atapist		# ATAPI tape drives
@@ -242,7 +259,7 @@
  options 	ATA_STATIC_ID	# Static device numbering
  
  # SCSI Controllers
-@@ -128,7 +129,6 @@ device		sym		# NCR/Symbios Logic (newer
+@@ -128,7 +129,6 @@
  device		trm		# Tekram DC395U/UW/F DC315U adapters
  
  device		adv		# Advansys SCSI adapters
@@ -250,7 +267,7 @@
  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
-@@ -199,10 +199,6 @@ device		uart		# Generic UART driver
+@@ -199,10 +199,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -261,7 +278,7 @@
  
  # If you've got a "dumb" serial or parallel PCI card that is
  # supported by the puc(4) glue driver, uncomment the following
-@@ -215,8 +211,6 @@ device		em		# Intel PRO/1000 Gigabit Eth
+@@ -215,8 +211,6 @@
  device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
  device		ixgb		# Intel PRO/10GbE Ethernet Card
  device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
@@ -270,7 +287,7 @@
  device		vx		# 3Com 3c590, 3c595 (``Vortex'')
  
  # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -226,12 +220,10 @@ device		ae		# Attansic/Atheros L2 FastEt
+@@ -226,12 +220,10 @@
  device		age		# Attansic/Atheros L1 Gigabit Ethernet
  device		alc		# Atheros AR8131/AR8132 Ethernet
  device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@@ -283,7 +300,7 @@
  device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
  device		lge		# Level 1 LXT1001 gigabit Ethernet
  device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -241,7 +233,6 @@ device		nge		# NatSemi DP83820 gigabit E
+@@ -241,7 +233,6 @@
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
@@ -291,7 +308,7 @@
  device		sge		# Silicon Integrated Systems SiS190/191
  device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
  device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -262,7 +253,6 @@ device		ex		# Intel EtherExpress Pro/10
+@@ -262,7 +253,6 @@
  device		ep		# Etherlink III based cards
  device		fe		# Fujitsu MB8696x based cards
  device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -299,7 +316,7 @@
  device		xe		# Xircom pccard Ethernet
  
  # Wireless NIC cards
-@@ -288,11 +278,8 @@ device		loop		# Network loopback
+@@ -288,11 +278,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -311,26 +328,44 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -312,7 +299,6 @@ device		ukbd		# Keyboard
- device		ulpt		# Printer
+@@ -306,36 +293,9 @@
+ device		ohci		# OHCI PCI->USB interface
+ device		ehci		# EHCI PCI->USB interface (USB 2.0)
+ device		usb		# USB Bus (required)
+-#device		udbp		# USB Double Bulk Pipe devices
+-device		uhid		# "Human Interface Devices"
+ device		ukbd		# Keyboard
+-device		ulpt		# Printer
  device		umass		# Disks/Mass storage - Requires scbus and da
  device		ums		# Mouse
 -device		urio		# Diamond Rio 500 MP3 player
- # USB Serial devices
- device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
- device		uark		# Technologies ARK3116 based serial adapters
-@@ -332,10 +318,7 @@ device		kue		# Kawasaki LSI USB Ethernet
- device		rue		# RealTek RTL8150 USB Ethernet
- device		udav		# Davicom DM9601E USB
- # USB Wireless
+-# USB Serial devices
+-device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
+-device		uark		# Technologies ARK3116 based serial adapters
+-device		ubsa		# Belkin F5U103 and compatible serial adapters
+-device		uftdi		# For FTDI usb serial adapters
+-device		uipaq		# Some WinCE based devices
+-device		uplcom		# Prolific PL-2303 serial adapters
+-device		uslcom		# SI Labs CP2101/CP2102 serial adapters
+-device		uvisor		# Visor and Palm devices
+-device		uvscom		# USB serial support for DDI pocket's PHS
+-# USB Ethernet, requires miibus
+-device		aue		# ADMtek USB Ethernet
+-device		axe		# ASIX Electronics USB Ethernet
+-device		cdce		# Generic USB over Ethernet
+-device		cue		# CATC USB Ethernet
+-device		kue		# Kawasaki LSI USB Ethernet
+-device		rue		# RealTek RTL8150 USB Ethernet
+-device		udav		# Davicom DM9601E USB
+-# USB Wireless
 -device		rum		# Ralink Technology RT2501USB wireless NICs
 -device		uath		# Atheros AR5523 wireless NICs
- device		ural		# Ralink Technology RT2500USB wireless NICs
+-device		ural		# Ralink Technology RT2500USB wireless NICs
 -device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -344,3 +327,11 @@ device		fwe		# Ethernet over FireWire (n
+@@ -344,3 +304,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-06-29 10:36:42 UTC (rev 3504)
+++ trunk/kfreebsd-9/debian/changelog	2011-06-29 11:11:59 UTC (rev 3505)
@@ -5,8 +5,11 @@
     symlink to header package.
   * Require either libsbuf-dev or kfreebsd-kernel-headers that provides
     a valid <sys/sbuf.h>.
+  * Remove drivers for USB devices from kernel, now that devd autoloads them.
+    Remove drivers for PCI sound devices as well, also autoloaded by devd and
+    which weren't present in kfreebsd-8 anyway.
 
- -- Robert Millan <rmh at debian.org>  Tue, 28 Jun 2011 18:38:14 +0200
+ -- Robert Millan <rmh at debian.org>  Wed, 29 Jun 2011 13:10:28 +0200
 
 kfreebsd-9 (9.0~svn223502-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-9/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-9/debian/control.flavor.in	2011-06-29 10:36:42 UTC (rev 3504)
+++ trunk/kfreebsd-9/debian/control.flavor.in	2011-06-29 11:11:59 UTC (rev 3505)
@@ -1,6 +1,6 @@
 Package: kfreebsd-image- at version@- at abiname@- at flavor@
 Architecture: any- at arch@
-Depends: freebsd-utils (>= 5), kldutils (>= 7.1), ${misc:Depends}
+Depends: freebsd-utils (>= 8.2+ds1-1), kldutils (>= 7.1), ${misc:Depends}
 Conflicts: kfreebsd-loader (<< 5.4-1.3)
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@

Modified: trunk/kfreebsd-9/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_config.diff	2011-06-29 10:36:42 UTC (rev 3504)
+++ trunk/kfreebsd-9/debian/patches/999_config.diff	2011-06-29 11:11:59 UTC (rev 3505)
@@ -126,37 +126,57 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -307,7 +287,6 @@
- device		ulpt		# Printer
+@@ -301,39 +281,9 @@
+ device		ehci		# EHCI PCI->USB interface (USB 2.0)
+ device		xhci		# XHCI PCI->USB interface (USB 3.0)
+ device		usb		# USB Bus (required)
+-#device		udbp		# USB Double Bulk Pipe devices (needs netgraph)
+-device		uhid		# "Human Interface Devices"
+ device		ukbd		# Keyboard
+-device		ulpt		# Printer
  device		umass		# Disks/Mass storage - Requires scbus and da
  device		ums		# Mouse
 -device		urio		# Diamond Rio 500 MP3 player
- # USB Serial devices
- device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
- device		uark		# Technologies ARK3116 based serial adapters
-@@ -323,17 +302,13 @@
- device		axe		# ASIX Electronics USB Ethernet
- device		cdce		# Generic USB over Ethernet
- device		cue		# CATC USB Ethernet
+-# USB Serial devices
+-device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
+-device		uark		# Technologies ARK3116 based serial adapters
+-device		ubsa		# Belkin F5U103 and compatible serial adapters
+-device		uftdi		# For FTDI usb serial adapters
+-device		uipaq		# Some WinCE based devices
+-device		uplcom		# Prolific PL-2303 serial adapters
+-device		uslcom		# SI Labs CP2101/CP2102 serial adapters
+-device		uvisor		# Visor and Palm devices
+-device		uvscom		# USB serial support for DDI pocket's PHS
+-# USB Ethernet, requires miibus
+-device		aue		# ADMtek USB Ethernet
+-device		axe		# ASIX Electronics USB Ethernet
+-device		cdce		# Generic USB over Ethernet
+-device		cue		# CATC USB Ethernet
 -device		kue		# Kawasaki LSI USB Ethernet
- device		rue		# RealTek RTL8150 USB Ethernet
- device		udav		# Davicom DM9601E USB
- # USB Wireless
+-device		rue		# RealTek RTL8150 USB Ethernet
+-device		udav		# Davicom DM9601E USB
+-# USB Wireless
 -device		rum		# Ralink Technology RT2501USB wireless NICs
- device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
+-device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
 -device		uath		# Atheros AR5523 wireless NICs
- device		upgt		# Conexant/Intersil PrismGT wireless NICs.
- device		ural		# Ralink Technology RT2500USB wireless NICs
- device		urtw		# Realtek RTL8187B/L wireless NICs
+-device		upgt		# Conexant/Intersil PrismGT wireless NICs.
+-device		ural		# Ralink Technology RT2500USB wireless NICs
+-device		urtw		# Realtek RTL8187B/L wireless NICs
 -device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -350,3 +325,11 @@
- device		snd_ich		# Intel, NVidia and other ICH AC'97 Audio
- device		snd_uaudio	# USB Audio
- device		snd_via8233	# VIA VT8233x Audio
-+
+@@ -343,10 +293,10 @@
+ device		dcons		# Dumb console driver
+ device		dcons_crom	# Configuration ROM for dcons
+ 
+-# Sound support
+-device		sound		# Generic sound driver (required)
+-device		snd_es137x	# Ensoniq AudioPCI ES137x
+-device		snd_hda		# Intel High Definition Audio
+-device		snd_ich		# Intel, NVidia and other ICH AC'97 Audio
+-device		snd_uaudio	# USB Audio
+-device		snd_via8233	# VIA VT8233x Audio
 +# Alternate queueing
 +options		ALTQ
 +options		ALTQ_CBQ	# Class Bases Queuing (CBQ)
@@ -305,37 +325,57 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -320,7 +302,6 @@
- device		ulpt		# Printer
+@@ -314,39 +296,9 @@
+ device		ehci		# EHCI PCI->USB interface (USB 2.0)
+ device		xhci		# XHCI PCI->USB interface (USB 3.0)
+ device		usb		# USB Bus (required)
+-#device		udbp		# USB Double Bulk Pipe devices (needs netgraph)
+-device		uhid		# "Human Interface Devices"
+ device		ukbd		# Keyboard
+-device		ulpt		# Printer
  device		umass		# Disks/Mass storage - Requires scbus and da
  device		ums		# Mouse
 -device		urio		# Diamond Rio 500 MP3 player
- # USB Serial devices
- device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
- device		uark		# Technologies ARK3116 based serial adapters
-@@ -336,17 +317,13 @@
- device		axe		# ASIX Electronics USB Ethernet
- device		cdce		# Generic USB over Ethernet
- device		cue		# CATC USB Ethernet
+-# USB Serial devices
+-device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
+-device		uark		# Technologies ARK3116 based serial adapters
+-device		ubsa		# Belkin F5U103 and compatible serial adapters
+-device		uftdi		# For FTDI usb serial adapters
+-device		uipaq		# Some WinCE based devices
+-device		uplcom		# Prolific PL-2303 serial adapters
+-device		uslcom		# SI Labs CP2101/CP2102 serial adapters
+-device		uvisor		# Visor and Palm devices
+-device		uvscom		# USB serial support for DDI pocket's PHS
+-# USB Ethernet, requires miibus
+-device		aue		# ADMtek USB Ethernet
+-device		axe		# ASIX Electronics USB Ethernet
+-device		cdce		# Generic USB over Ethernet
+-device		cue		# CATC USB Ethernet
 -device		kue		# Kawasaki LSI USB Ethernet
- device		rue		# RealTek RTL8150 USB Ethernet
- device		udav		# Davicom DM9601E USB
- # USB Wireless
+-device		rue		# RealTek RTL8150 USB Ethernet
+-device		udav		# Davicom DM9601E USB
+-# USB Wireless
 -device		rum		# Ralink Technology RT2501USB wireless NICs
- device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
+-device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
 -device		uath		# Atheros AR5523 wireless NICs
- device		upgt		# Conexant/Intersil PrismGT wireless NICs.
- device		ural		# Ralink Technology RT2500USB wireless NICs
- device		urtw		# Realtek RTL8187B/L wireless NICs
+-device		upgt		# Conexant/Intersil PrismGT wireless NICs.
+-device		ural		# Ralink Technology RT2500USB wireless NICs
+-device		urtw		# Realtek RTL8187B/L wireless NICs
 -device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -363,3 +340,11 @@
- device		snd_ich		# Intel, NVidia and other ICH AC'97 Audio
- device		snd_uaudio	# USB Audio
- device		snd_via8233	# VIA VT8233x Audio
-+
+@@ -356,10 +308,10 @@
+ device		dcons		# Dumb console driver
+ device		dcons_crom	# Configuration ROM for dcons
+ 
+-# Sound support
+-device		sound		# Generic sound driver (required)
+-device		snd_es137x	# Ensoniq AudioPCI ES137x
+-device		snd_hda		# Intel High Definition Audio
+-device		snd_ich		# Intel, NVidia and other ICH AC'97 Audio
+-device		snd_uaudio	# USB Audio
+-device		snd_via8233	# VIA VT8233x Audio
 +# Alternate queueing
 +options		ALTQ
 +options		ALTQ_CBQ	# Class Bases Queuing (CBQ)




More information about the Glibc-bsd-commits mailing list