From owner-svn-src-all@FreeBSD.ORG Sat Aug 7 13:25:47 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E133F106564A; Sat, 7 Aug 2010 13:25:46 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CA59F8FC15; Sat, 7 Aug 2010 13:25:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o77DPkE1052155; Sat, 7 Aug 2010 13:25:46 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o77DPkSR052153; Sat, 7 Aug 2010 13:25:46 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201008071325.o77DPkSR052153@svn.freebsd.org> From: Bruce Cran Date: Sat, 7 Aug 2010 13:25:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211015 - stable/8/sys/boot/forth X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Aug 2010 13:25:47 -0000 Author: brucec Date: Sat Aug 7 13:25:46 2010 New Revision: 211015 URL: http://svn.freebsd.org/changeset/base/211015 Log: MFC r209466: Add some more modules to loader.conf. Remove if_awi since support for it was removed 2 years ago. PR: conf/147126 PR: conf/116071 Approved by: rrs (mentor) Modified: stable/8/sys/boot/forth/loader.conf Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cam/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/boot/forth/loader.conf ============================================================================== --- stable/8/sys/boot/forth/loader.conf Sat Aug 7 13:02:26 2010 (r211014) +++ stable/8/sys/boot/forth/loader.conf Sat Aug 7 13:25:46 2010 (r211015) @@ -119,6 +119,35 @@ module_path="/boot/modules" # Set the mo ############################################################## +### ATA modules ############################################## +############################################################## + +ataahci_load="NO" # AHCI SATA +ataacard_load="NO" # ACARD +ataacerlabs_load="NO" # Acer Labs Inc. (ALI) +ataadaptec_load="NO" # Adaptec +ataamd_load="NO" # American Micro Devices (AMD) +ataati_load="NO" # ATI +atacenatek_load="NO" # Cenatek +atacypress_load="NO" # Cypress +atacyrix_load="NO" # Cyrix +atahighpoint_load="NO" # HighPoint +ataintel_load="NO" # Intel +ataite_load="NO" # Integrated Technology Inc. (ITE) +atajmicron_load="NO" # JMicron +atamarvell_load="NO" # Marvell +atamicron_load="NO" # Micron +atanational_load="NO" # National +atanetcell_load="NO" # NetCell +atanvidia_load="NO" # nVidia +atapromise_load="NO" # Promise +ataserverworks_load="NO" # ServerWorks +atasiliconimage_load="NO" # Silicon Image Inc. (SiI) (formerly CMD) +atasis_load="NO" # Silicon Integrated Systems Corp.(SiS) +atavia_load="NO" # VIA Technologies Inc. + + +############################################################## ### Filesystem and related modules ######################### ############################################################## @@ -133,6 +162,7 @@ msdosfs_load="NO" # FAT-12/16/32 nfsclient_load="NO" # NFS client nfsserver_load="NO" # NFS server ntfs_load="NO" # NTFS +ntfs_iconv_load="NO" # NTFS iconv character support nullfs_load="NO" # Null filesystem portalfs_load="NO" # Portal filesystem procfs_load="NO" # Process filesystem @@ -164,6 +194,18 @@ geom_vinum_load="NO" # Concatenated/mir ############################################################## +### FireWire modules ####################################### +############################################################## + +firewire_load="NO" # IEEE1394 High-performance Serial Bus +fwe_load="NO" # Ethernet emulation driver for FireWire +fwip_load="NO" # IP over FireWire driver +fwohci_load="NO" # OHCI FireWire chipset device driver +sbp_load="NO" # SBP-2 Mass Storage Devices driver +sbp_targ_load="NO" # SBP-2 Target mode + + +############################################################## ### Screen saver modules ################################### ############################################################## @@ -216,16 +258,17 @@ if_ale_load="NO" # Atheros AR8121/AR811 if_an_load="NO" # Aironet 4500/4800 802.11 wireless NICs if_ath_load="NO" # Atheros IEEE 802.11 wireless NICs if_aue_load="NO" # ADMtek AN986 Pegasus USB Ethernet -if_awi_load="NO" # AMD PCnetMobile IEEE 802.11 wireless NICs if_axe_load="NO" # ASIX Electronics AX88172 USB Ethernet if_bce_load="NO" # Broadcom NetXtreme II Gigabit Ethernet if_bfe_load="NO" # Broadcom BCM4401 if_bge_load="NO" # Broadcom BCM570x PCI Gigabit Ethernet +if_bwi_load="NO" # Broadcom BCM53xx IEEE 802.11b/g wireness NICs if_bwn_load="NO" # Broadcom BCM43xx IEEE 802.11 wireless NICs if_cas_load="NO" # Sun Cassini/Cassini+ and NS DP83065 Saturn if_cm_load="NO" # SMC (90c26, 90c56, 90c66) if_cs_load="NO" # Crystal Semiconductor CS8920 if_cue_load="NO" # CATC USB-EL1210A USB Ethernet +if_cxgb_load="NO" # Chelsio T3 10 Gigabit Ethernet if_dc_load="NO" # DEC/Intel 21143 and various workalikes if_de_load="NO" # DEC DC21x4x Ethernet if_ed_load="NO" # National Semiconductor DS8390/WD83C690 @@ -235,16 +278,19 @@ if_en_load="NO" # Midway-based ATM int if_ep_load="NO" # 3Com Etherlink III (3c5x9) if_et_load="NO" # Agere ET1310 10/100/Gigabit Ethernet if_ex_load="NO" # Intel EtherExpress Pro/10 Ethernet +if_fatm_load="NO" # Fore PCA200E ATM if_fe_load="NO" # Fujitsu MB86960A/MB86965A based Ethernet # adapters if_fxp_load="NO" # Intel EtherExpress PRO/100B (82557, 82558) if_gem_load="NO" # Sun GEM/Sun ERI/Apple GMAC +if_hatm_load="NO" # Fore/Marconi HE155 and HE622 if_hme_load="NO" # Sun Microelectronics STP2002-STQ Ethernet if_ie_load="NO" # Intel 82586 if_igb_load="NO" # Intel(R) PRO/1000 Gigabit Ethernet if_ipw_load="NO" # Intel PRO/Wireless 2100 wireless if_iwi_load="NO" # Intel PRO/Wireless 2200BG/2225BG/2915ABG # wireless +if_iwn_load="NO" # Intel Wireless WiFi Link 802.11n wireless if_ixgb_load="NO" # Intel PRO/10Gb Ethernet if_ixgbe_load="NO" # Intel PRO/10Gb Ethernet PCI Express if_jme_load="NO" # JMicron JMC250 Gigabit/JMC260 Fast Ethernet @@ -260,11 +306,14 @@ if_nfe_load="NO" # NVIDIA nForce MCP Ne if_nge_load="NO" # National Semiconductor PCI Gigabit Ethernet if_nve_load="NO" # NVIDIA nForce MCP Networking Adapter if_nxge_load="NO" # Neterion Xframe 10Gb Ethernet +if_patm_load="NO" # IDT77252 ATM if_pcn_load="NO" # AMD PCnet PCI if_ral_load="NO" # Ralink Technology wireless if_re_load="NO" # RealTek 8139C+/8169/8169S/8110S if_rl_load="NO" # RealTek 8129/8139 if_rue_load="NO" # RealTek RTL8150 USB to Fast Ethernet +if_rum_load="NO" # Ralink Technology USB 802.11a/b/g wireless +if_run_load="NO" # Ralink Technology USB 802.11a/g/n wireless if_sbni_load="NO" # Granch SBNI12 leased line adapters if_sf_load="NO" # Adaptec Duralink PCI (AIC-6915 "starfire") if_sge_load="NO" # Silicon Integrated Systems SiS 190/191 @@ -290,6 +339,7 @@ if_wi_load="NO" # WaveLAN/IEEE 802.11 if_wpi_load="NO" # Intel 3945ABG Wireless LAN IEEE 802.11 if_xe_load="NO" # Xircom CreditCard PCMCIA if_xl_load="NO" # 3Com Etherlink XL (3c900, 3c905, 3c905B) +utopia_load="NO" # ATM PHY driver ############################################################## ### Netgraph modules ####################################### @@ -376,18 +426,27 @@ snd_driver_load="NO" # All sound driver usb_load="NO" # USB subsystem udbp_load="NO" # USB double bulk pipe host 2 host cables ugen_load="NO" # USB generic device, if all else fails ... +ucycom_load="NO" # Cyprus USB serial adapters ufm_load="NO" # Fm Radio uhid_load="NO" # Human Interface Devices ukbd_load="NO" # Keyboard ulpt_load="NO" # Printer ums_load="NO" # Mouse umass_load="NO" # Mass Storage Devices +umct_load="NO" # Magic Control Technology USB-RS232 umodem_load="NO" # Modems +uplcom_load="NO" # Prolific USB serial adapters +urio_load="NO" # Rio MP3 players +uvisor_load="NO" # PalmOS based PDAs if_aue_load="NO" # ADMtek USB ethernet if_axe_load="NO" # ASIX Electronics AX88172 USB ethernet +if_cdce_load="NO" # Ethernet over USB (CDC) if_cue_load="NO" # CATC USB ethernet if_kue_load="NO" # Kawasaki LSI USB ethernet +if_rae_load="NO" # Realtek RTL8150 USB adapter. if_rum_load="NO" # Ralink USB 802.11 wireless adapter +if_uath_load="NO" # Atheros AR5523 wireless adapter +if_run_load="NO" # Ralink USB 802.11 wireless adapter if_ural_load="NO" # Ralink RT2500USB 802.11 wireless adapter if_zyd_load="NO" # ZyDAS ZD1211(B) USB 802.11 wireless adapter snd_uaudio_load="NO" # USB audio @@ -396,15 +455,22 @@ snd_uaudio_load="NO" # USB audio ### Other modules ########################################## ############################################################## +aio_load="NO" # Asynchronous I/O bktr_load="NO" # Brooktree Bt848/Bt878 TV/Video Capture Card ispfw_load="NO" # Qlogic ISP Firmware agp_load="NO" # agp module accf_data_load="NO" # Wait for data accept filter accf_dns_load="NO" # Wait for full DNS request accept filter accf_http_load="NO" # Wait for full HTTP request accept filter +ppi_load="NO" # Interface to ppbus parallel 'geek' port +pps_load="NO" # Pulse per second devices +puc_load="NO" # PCI "Universal" Communications driver random_load="NO" # Random device speaker_load="NO" # AT speaker module coretemp_load="NO" # Intel Core CPU temperature monitor +vkbd_load="NO" # Virtual AT keyboard interface +vpd_load="NO" # Vital Product Data kernel interface +vpo_load="NO" # Parallel to SCSI interface driver amdtemp_load="NO" # AMD K8/K10/K11 temperature monitor ##############################################################