From 3ec91ea962ea924cfe3437d83d5561d7dca4c2f4 Mon Sep 17 00:00:00 2001 From: Yoshihiro Takahashi Date: Fri, 19 May 2000 16:36:42 +0000 Subject: [PATCH] Sync with sys/i386/conf/GENERIC revisions from 1.246 to 1.256. --- sys/pc98/conf/GENERIC | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index ccd610ae08cb..4ed5caab79b3 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -4,11 +4,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.freebsd.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the @@ -56,6 +56,7 @@ options SYSVSEM #SYSV-style semaphores options P1003_1B #Posix P1003_1B real-time extensions options _KPOSIX_PRIORITY_SCHEDULING options ICMP_BANDLIM #Rate limit bad replies +#options KBD_INSTALL_CDEV # install a CDEV entry in /dev # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel @@ -128,12 +129,12 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # RAID controllers +device ida # Compaq Smart RAID device amr # AMI MegaRAID device mlx # Mylex DAC960 family # keyboard driver device pckbd0 at isa? port IO_KBD irq 1 -#options KBD_INSTALL_CDEV device gdc0 at isa? @@ -259,22 +260,23 @@ device fe1 at isa? port 0x73d0 irq 5 device ep0 at isa? port 0x40d0 irq 3 device lnc0 at isa? port 0x03d0 irq 6 +device sn # WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really # exists only as a PCMCIA device, so there is no ISA attatement needed # and resources will always be dynamically assigned by the pccard code. device wi - # Aironet 4500/4800 802.11 wireless NICs. Note: the declaration below will # work for PCMCIA and PCI cards, as well as ISA cards set to ISA PnP # mode (the factory default). If you set the switches on your ISA # card for a manually chosen I/O address and IRQ, you must specify # those paremeters here. device an +# BayStack 660 and others +device awi +# Xircom pccard ethernet +device xe -# requires PCCARD (PCMCIA) support to be activated -device sn -#device xe0 at isa? #device snd #device sb0 at isa? port 0x20d2 irq 10 drq 3 @@ -309,7 +311,7 @@ pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation) # The `bpf' pseudo-device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! -pseudo-device bpf #Berkeley packet filter +pseudo-device bpf # Berkeley packet filter #pseudo-device compat_atdisk #IBM-PC HDD support @@ -317,12 +319,14 @@ pseudo-device bpf #Berkeley packet filter #device uhci # UHCI PCI->USB interface #device ohci # OHCI PCI->USB interface #device usb # USB Bus (required) +#device udbp # USB Double Bulk Pipe devices #device ugen # Generic #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 Ethernet, requires mii #device aue # ADMtek USB ethernet #device cue # CATC USB ethernet