Author: marius
Date: Fri May 25 14:52:05 2012
New Revision: 235994
URL: http://svn.freebsd.org/changeset/base/235994

Log:
  Merge from x86: r232521
  
  Exclude USB drivers (except umass and ukbd) from main kernel image.

Modified:
  head/sys/sparc64/conf/GENERIC

Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC       Fri May 25 14:49:51 2012        
(r235993)
+++ head/sys/sparc64/conf/GENERIC       Fri May 25 14:52:05 2012        
(r235994)
@@ -234,35 +234,8 @@ device             uhci            # UHCI PCI->USB 
interface
 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 (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         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         zyd             # ZyDAS zd1211/zd1211b wireless NICs
 
 # FireWire support
 device         firewire        # FireWire bus code
@@ -278,4 +251,3 @@ device              sound           # Generic sound driver 
(r
 device         snd_audiocs     # Crystal Semiconductor CS4231
 device         snd_es137x      # Ensoniq AudioPCI ES137x
 device         snd_t4dwave     # Acer Labs M5451
-device         snd_uaudio      # USB Audio
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to