Synced with sys/i386/conf/GENERIC rev 1.230.

This commit is contained in:
KATO Takenori 2000-01-20 08:34:40 +00:00
parent b7592c7bea
commit c818f7b9de
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=56323
2 changed files with 20 additions and 2 deletions

View File

@ -53,7 +53,10 @@ options VISUAL_USERCONFIG #visual boot -c editor
options KTRACE #ktrace(1) syscall trace support
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
ioptions SYSVSEM #SYSV-style semaphores
options P1003_1B #Posix P1003_1B real-time extentions
options _KPOSIX_PRIORITY_SCHEDULING
options _KPOSIX_VERSION=199309L
# To make an SMP kernel, the next two are needed
#options SMP # Symmetric MultiProcessor Kernel
@ -260,6 +263,12 @@ device ep0 at isa? port 0x40d0 irq 3
# 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 wi0
# 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 an0
#device snd0
#device sb0 at isa? port 0x20d2 irq 10 conflicts drq 3

View File

@ -53,7 +53,10 @@ options VISUAL_USERCONFIG #visual boot -c editor
options KTRACE #ktrace(1) syscall trace support
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
ioptions SYSVSEM #SYSV-style semaphores
options P1003_1B #Posix P1003_1B real-time extentions
options _KPOSIX_PRIORITY_SCHEDULING
options _KPOSIX_VERSION=199309L
# To make an SMP kernel, the next two are needed
#options SMP # Symmetric MultiProcessor Kernel
@ -260,6 +263,12 @@ device ep0 at isa? port 0x40d0 irq 3
# 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 wi0
# 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 an0
#device snd0
#device sb0 at isa? port 0x20d2 irq 10 conflicts drq 3