Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/amd64/conf/GENERIC,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/amd64/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.231.4.11 retrieving revision 1.232 diff -u -p -r1.231.4.11 -r1.232 --- src/sys/arch/amd64/conf/GENERIC 2013/06/19 07:50:14 1.231.4.11 +++ src/sys/arch/amd64/conf/GENERIC 2008/11/12 12:35:56 1.232 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.231.4.11 2013/06/19 07:50:14 bouyer Exp $ +# $NetBSD: GENERIC,v 1.232 2008/11/12 12:35:56 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.231.4.11 $" +#ident "GENERIC-$Revision: 1.232 $" maxusers 64 # estimated number of users @@ -66,7 +66,6 @@ options SYSVSEM # System V-like semaph options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options MODULAR # new style module framework options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) @@ -82,10 +81,10 @@ options POWERNOW_K8 # Intel(R) On Demand Clock Modulation (aka ODCM) # options INTEL_ONDEMAND_CLOCKMOD -# Alternate buffer queue strategies for better responsiveness under high -# disk I/O load. +# Enable experimental buffer queue strategy for better responsiveness under +# high disk I/O load. Use it with caution - it's not proven to be stable yet. #options BUFQ_READPRIO -options BUFQ_PRIOCSCAN +#options BUFQ_PRIOCSCAN # Diagnostic/debugging support options #options DIAGNOSTIC # expensive kernel consistency checks @@ -153,7 +152,6 @@ file-system PTYFS # /dev/pts/N support file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system #file-system HFS # experimental - Apple HFS+ (read-only) -file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) # File system options options QUOTA # UFS quotas @@ -297,8 +295,7 @@ pcppi* at acpi? # AT-st sony* at acpi? # Sony Notebook Controller thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys ug* at acpi? # Abit uGuru Hardware monitor -wb* at acpi? # Winbond W83L518D SD/MMC reader -sdmmc* at wb? # SD/MMC bus +wss* at acpi? # NeoMagic 256AV in wss mode #apm0 at mainbus0 # Advanced power management @@ -356,7 +353,6 @@ pckbd* at pckbc? # PC keyboard pms* at pckbc? # PS/2 mouse for wsmouse #options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads -options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads vga* at pci? dev ? function ? wsdisplay* at vga? console ? wskbd* at pckbd? console ? @@ -609,9 +605,7 @@ fd* at fdc? drive ? # the drives thems # Network Interfaces # PCI network interfaces -age* at pci? dev ? function ? # Attansic/Atheros L1 Gigabit Ethernet an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) -ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) bce* at pci? dev ? function ? # Broadcom 440x 10/100 Ethernet @@ -697,7 +691,6 @@ tlp* at cardbus? function ? # DECchip 21 # MII/PHY support acphy* at mii? phy ? # DAltima AC101 and AMD Am79c874 PHYs amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs -atphy* at mii? phy ? # Attansic/Atheros PHYs bmtphy* at mii? phy ? # Broadcom BCM5201 and BCM5202 PHYs brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs ciphy* at mii? phy ? # Cicada CS8201 Gig-E PHYs @@ -708,7 +701,6 @@ glxtphy* at mii? phy ? # Level One LXT gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x igphy* at mii? phy ? # Intel IGP01E1000 -ihphy* at mii? phy ? # Intel 82577 PHYs ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs @@ -762,10 +754,6 @@ uhidev* at uhub? port ? configuration ? ums* at uhidev? reportid ? wsmouse* at ums? mux 0 -# USB Touchscreens -uts* at uhidev? reportid ? -wsmouse* at uts? mux 0 - # USB eGalax touch-panel uep* at uhub? port ? wsmouse* at uep? mux 0 @@ -911,14 +899,6 @@ ieee1394if* at fwohci? fwip* at ieee1394if? # IP over IEEE1394 sbp* at ieee1394if? euihi ? euilo ? -# SD/MMC/SDIO Controller and Device support - -# SD/MMC controller -sdhc* at pci? # SD Host Controller -sdmmc* at sdhc? # SD/MMC bus - -ld* at sdmmc? - # Audio Devices # PCI audio devices @@ -948,10 +928,6 @@ opl* at eso? opl* at fms? opl* at sv? -# High Definition Audio -#hdaudio* at pci? dev ? function ? # High Definition Audio -#hdafg* at hdaudiobus? - # Audio support audio* at audiobus? @@ -1018,10 +994,6 @@ wsmouse* at btms? mux 0 btkbd* at bthidev? reportid ? wskbd* at btkbd? console ? mux 1 -# Bluetooth Apple Magic Mouse -btmagic* at bthub? -wsmouse* at btmagic? mux 0 - # Bluetooth Audio support btsco* at bthub? @@ -1032,12 +1004,6 @@ btsco* at bthub? # devices (watchdog timer, etc.) weasel* at pci? -# Virtio devices -virtio* at pci? dev ? function ? # Virtio PCI device -viomb* at virtio? # Virtio memory balloon device -ld* at virtio? # Virtio disk device -vioif* at virtio? # Virtio network device - # Pull in optional local configuration cinclude "arch/amd64/conf/GENERIC.local" @@ -1125,9 +1091,6 @@ pseudo-device pad # userland interface to drivers, including autoconf and properties retrieval pseudo-device drvctl -# Pass-to-Userspace TransporTER, required for puffs(4) and pud(4) -pseudo-device putter - options FILEASSOC # fileassoc(9) - required for Veriexec # Veriexec