diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2009-05-10 00:00:25 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2009-05-10 00:00:25 +0000 |
| commit | b3b17597eab61d4ea34f1cfd653c53d284e18c75 (patch) | |
| tree | 200771cd75bef85df04e89efbd2c006e84a82b8b | |
| parent | dc974bbb9bb3cc7b258c6d4b8b494bdde8bbf715 (diff) | |
| download | src-b3b17597eab61d4ea34f1cfd653c53d284e18c75.tar.gz src-b3b17597eab61d4ea34f1cfd653c53d284e18c75.zip | |
- Use "device\t" and "options \t" for consistency.
Notes
Notes:
svn path=/head/; revision=191954
39 files changed, 406 insertions, 406 deletions
diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index 768d6a1bfaf6..c41e1c698d68 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -21,4 +21,4 @@ options GEOM_PART_EBR options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR -options FLOWTABLE +options FLOWTABLE diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 19cb70248310..569e0cd6790c 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -68,7 +68,7 @@ options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -114,7 +114,7 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug device amd # AMD 53C974 (Tekram DC-390(T)) device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module +#device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -260,7 +260,7 @@ device wlan_amrr # AMRR transmit rate control algorithm device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 95ae9be4ce05..caddd339619a 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -33,7 +33,7 @@ options MP_WATCHDOG # # Debugging options. # -options STOP_NMI # Stop CPUS using NMI instead of IPI +options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -82,7 +82,7 @@ options DEVICE_POLLING # BPF_JITTER adds support for BPF just-in-time compiler. -options BPF_JITTER +options BPF_JITTER ##################################################################### @@ -153,7 +153,7 @@ device agp # # AGP debugging. # -options AGP_DEBUG +options AGP_DEBUG ##################################################################### @@ -288,7 +288,7 @@ device wpi device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath #device ath_rate_amrr # AMRR rate control for ath driver #device ath_rate_onoe # Onoe rate control for ath driver @@ -457,7 +457,7 @@ options LINPROCFS #Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 # and PSEUDOFS) -options LINSYSFS +options LINSYSFS # # SysVR4 ABI emulation diff --git a/sys/amd64/conf/XENHVM b/sys/amd64/conf/XENHVM index 6080737c9f07..5e108d51ea27 100644 --- a/sys/amd64/conf/XENHVM +++ b/sys/amd64/conf/XENHVM @@ -69,12 +69,12 @@ options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks -options NO_ADAPTIVE_MUTEXES -options NO_ADAPTIVE_RWLOCKS +options NO_ADAPTIVE_MUTEXES +options NO_ADAPTIVE_RWLOCKS # Debugging for use in -current options KDB # Enable kernel debugger support. @@ -99,7 +99,7 @@ device pci device fdc # Xen HVM support -options XENHVM +options XENHVM device xenpci # ATA and ATAPI devices diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA index cd1d33807e1e..826dea2cdcc1 100644 --- a/sys/arm/conf/AVILA +++ b/sys/arm/conf/AVILA @@ -99,12 +99,12 @@ device loop device if_bridge device md -device random # Entropy device +device random # Entropy device # Wireless NIC cards device wlan # 802.11 support -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_TDMA +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_TDMA device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support @@ -112,12 +112,12 @@ device wlan_xauth device ath # Atheros pci/cardbus NIC's options ATH_DEBUG -options ATH_DIAGAPI -#options ATH_TX99_DIAG +options ATH_DIAGAPI +#options ATH_TX99_DIAG device ath_rate_sample # SampleRate tx rate control for ath -#options AH_DEBUG -#options AH_ASSERT +#options AH_DEBUG +#options AH_ASSERT #device ath_ar5210 #device ath_ar5211 device ath_ar5212 @@ -129,7 +129,7 @@ device ath_rf5112 device ath_rf5413 # device ath_ar5416 -options AH_SUPPORT_AR5416 +options AH_SUPPORT_AR5416 device ath_ar9160 makeoptions WITH_LEGACY diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT index 8b8ca11834ec..b92e626fb56d 100644 --- a/sys/arm/conf/BWCT +++ b/sys/arm/conf/BWCT @@ -19,9 +19,9 @@ ident BWCT -options VERBOSE_INIT_ARM +options VERBOSE_INIT_ARM -options AT91_BWCT +options AT91_BWCT include "../at91/std.bwct" #To statically compile in device wiring instead of /boot/device.hints @@ -30,8 +30,8 @@ hints "BWCT.hints" makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB options BREAK_TO_DEBUGGER options ALT_BREAK_TO_DEBUGGER @@ -43,15 +43,15 @@ options SOFTUPDATES #Enable FFS soft updates support #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device -#options MD_ROOT_SIZE=4096 # 3MB ram disk +#options MD_ROOT_SIZE=4096 # 3MB ram disk #options ROOTDEVNAME=\"ufs:md0\" #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options BOOTP_NFSROOT -options BOOTP +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options BOOTP_NFSROOT +options BOOTP #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem @@ -65,7 +65,7 @@ options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions #options SYSCTL_OMIT_DESCR options MUTEX_NOINLINE -options RWLOCK_NOINLINE +options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING device loop @@ -83,7 +83,7 @@ device rlswitch #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC device md device at91_twi # TWI: Two Wire Interface diff --git a/sys/arm/conf/CAMBRIA b/sys/arm/conf/CAMBRIA index 70655dec377e..8375a74d0ca3 100644 --- a/sys/arm/conf/CAMBRIA +++ b/sys/arm/conf/CAMBRIA @@ -68,7 +68,7 @@ device uart device ixpwdog # watchdog timer -options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M +options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M device cfi # flash support device cfid # flash disk support device geom_redboot # redboot fis parser @@ -86,7 +86,7 @@ device cambria_fled # Font Panel LED on I2C bus device cambria_led # 8-LED latch device ata -device atadisk # ATA disk drives +device atadisk # ATA disk drives device avila_ata # Gateworks CF/IDE support device npe # Network Processing Engine @@ -102,12 +102,12 @@ device loop device if_bridge device md -device random # Entropy device +device random # Entropy device # Wireless NIC cards device wlan # 802.11 support -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_TDMA +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_TDMA device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support @@ -115,13 +115,13 @@ device wlan_xauth device ath # Atheros pci/cardbus NIC's options ATH_DEBUG -options ATH_DIAGAPI -#options ATH_TX99_DIAG +options ATH_DIAGAPI +#options ATH_TX99_DIAG device ath_rate_sample # SampleRate tx rate control for ath -options AH_DEBUG -#options AH_ASSERT -options AH_PRIVATE_DIAG +options AH_DEBUG +#options AH_ASSERT +options AH_PRIVATE_DIAG #device ath_ar5210 #device ath_ar5211 # @@ -133,7 +133,7 @@ device ath_rf5112 device ath_rf5413 # #device ath_ar5416 -#options AH_SUPPORT_AR5416 # NB: for 11n descriptor format +#options AH_SUPPORT_AR5416 # NB: for 11n descriptor format #device ath_rf2133 #device ath_ar9160 #device ath_ar9280 @@ -142,8 +142,8 @@ device ath_rf5413 # NB: 2 USB 2.0 ports standard device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -#options USB_DEBUG +options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +#options USB_DEBUG device ehci device umass device scbus # SCSI bus (required for SCSI) diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB index 525213246376..ef0265fa4cb6 100644 --- a/sys/arm/conf/CRB +++ b/sys/arm/conf/CRB @@ -20,11 +20,11 @@ ident CRB options PHYSADDR=0x00000000 -options KERNPHYSADDR=0x00200000 -options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +options KERNPHYSADDR=0x00200000 +options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm -options COUNTS_PER_SEC=400000000 -options STARTUP_PAGETABLE_ADDR=0x00000000 +options COUNTS_PER_SEC=400000000 +options STARTUP_PAGETABLE_ADDR=0x00000000 include "../xscale/i8134x/std.crb" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. @@ -32,9 +32,9 @@ makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale -options HZ=100 -options BREAK_TO_DEBUGGER -#options DEVICE_POLLING +options HZ=100 +options BREAK_TO_DEBUGGER +#options DEVICE_POLLING options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -53,18 +53,18 @@ options CD9660 #ISO 9660 Filesystem options PSEUDOFS #Pseudo-filesystem framework options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) support -options INTR_FILTER +options INTR_FILTER options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=em0 -options BOOTP_COMPAT -#options PREEMPTION +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=em0 +options BOOTP_COMPAT +#options PREEMPTION device loop device ether #device saarm @@ -75,12 +75,12 @@ device uart device pci device ata -device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering +device atadisk # ATA disk drives +device ataraid # ATA RAID drives +device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives +device atapist # ATAPI tape drives +options ATA_STATIC_ID # Static device numbering device "7seg" @@ -93,22 +93,22 @@ device pty # output. Adds ~215k to driver. # Debugging for use in -current -options KDB +options KDB options DDB #Enable the kernel debugger #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O -options XSCALE_CACHE_READ_WRITE_ALLOCATE -device md -device random # Entropy device +options XSCALE_CACHE_READ_WRITE_ALLOCATE +device md +device random # Entropy device device iopwdog -options ARM_USE_SMALL_ALLOC +options ARM_USE_SMALL_ALLOC # Floppy drives diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX index 5d30cd1fdd7b..7f411a15869f 100644 --- a/sys/arm/conf/DB-78XXX +++ b/sys/arm/conf/DB-78XXX @@ -7,7 +7,7 @@ ident DB-88F78XX include "../mv/discovery/std.db78xxx" -options SOC_MV_DISCOVERY +options SOC_MV_DISCOVERY makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols @@ -18,34 +18,34 @@ options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options NFSCLIENT #Network Filesystem Client -options NFSLOCKD #Network Lock Manager +options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=mge0 +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=mge0 -#options ROOTDEVNAME=\"ufs:/dev/da0a\" +#options ROOTDEVNAME=\"ufs:/dev/da0a\" options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options MUTEX_NOINLINE -options RWLOCK_NOINLINE +options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING # Debugging -options ALT_BREAK_TO_DEBUGGER -options DDB -options DIAGNOSTIC +options ALT_BREAK_TO_DEBUGGER +options DDB +options DIAGNOSTIC #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options KDB +options KDB options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options WITNESS_KDB +#options WITNESS_KDB device pci diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX index 3b877cc910be..5989e3eec4b7 100644 --- a/sys/arm/conf/DB-88F5XXX +++ b/sys/arm/conf/DB-88F5XXX @@ -7,7 +7,7 @@ ident DB-88F5XXX include "../mv/orion/std.db88f5xxx" -options SOC_MV_ORION +options SOC_MV_ORION makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols @@ -18,34 +18,34 @@ options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options NFSCLIENT #Network Filesystem Client -options NFSLOCKD #Network Lock Manager +options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=mge0 +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=mge0 -#options ROOTDEVNAME=\"ufs:/dev/da0a\" +#options ROOTDEVNAME=\"ufs:/dev/da0a\" options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options MUTEX_NOINLINE -options RWLOCK_NOINLINE +options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING # Debugging -options ALT_BREAK_TO_DEBUGGER -options DDB -options DIAGNOSTIC +options ALT_BREAK_TO_DEBUGGER +options DDB +options DIAGNOSTIC #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options KDB +options KDB options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options WITNESS_KDB +#options WITNESS_KDB device pci @@ -64,8 +64,8 @@ device mge # Marvell Gigabit Ethernet controller device mii device e1000phy device bpf -options DEVICE_POLLING -options HZ=1000 +options DEVICE_POLLING +options HZ=1000 # I2C (TWSI) device iic diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX index 9831b3909681..c44f80118c73 100644 --- a/sys/arm/conf/DB-88F6XXX +++ b/sys/arm/conf/DB-88F6XXX @@ -7,7 +7,7 @@ ident DB-88F6XXX include "../mv/kirkwood/std.db88f6xxx" -options SOC_MV_KIRKWOOD +options SOC_MV_KIRKWOOD makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols @@ -18,34 +18,34 @@ options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options NFSCLIENT #Network Filesystem Client -options NFSLOCKD #Network Lock Manager +options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=mge0 +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=mge0 -#options ROOTDEVNAME=\"ufs:/dev/da0a\" +#options ROOTDEVNAME=\"ufs:/dev/da0a\" options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options MUTEX_NOINLINE -options RWLOCK_NOINLINE +options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING # Debugging -options ALT_BREAK_TO_DEBUGGER -options DDB -options DIAGNOSTIC +options ALT_BREAK_TO_DEBUGGER +options DDB +options DIAGNOSTIC #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options KDB +options KDB options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options WITNESS_KDB +#options WITNESS_KDB device pci diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219 index 44fe2621ca25..65121bc50733 100644 --- a/sys/arm/conf/EP80219 +++ b/sys/arm/conf/EP80219 @@ -20,11 +20,11 @@ ident EP80219 options PHYSADDR=0xa0000000 -options KERNPHYSADDR=0xa0200000 -options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +options KERNPHYSADDR=0xa0200000 +options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm options STARTUP_PAGETABLE_ADDR=0xa0000000 -#options ARM32_NEW_VM_LAYOUT +#options ARM32_NEW_VM_LAYOUT include "../xscale/i80321/std.ep80219" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. @@ -32,8 +32,8 @@ makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale -options HZ=100 -#options DEVICE_POLLING +options HZ=100 +#options DEVICE_POLLING options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -57,15 +57,15 @@ options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options GEOM_PART_GPT # GUID Partition Tables. -options GEOM_LABEL # Providers labelization. +options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_LABEL # Providers labelization. -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=fxp0 -options BOOTP_COMPAT -#options PREEMPTION +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=fxp0 +options BOOTP_COMPAT +#options PREEMPTION device loop device ether #device saarm @@ -75,12 +75,12 @@ device uart device pci device ata -device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering +device atadisk # ATA disk drives +device ataraid # ATA RAID drives +device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives +device atapist # ATAPI tape drives +options ATA_STATIC_ID # Static device numbering # SCSI Controllers @@ -89,27 +89,27 @@ device iopwdog # I80321 Watchdog device dma # I80321 DMA Controller # Debugging for use in -current -options KDB +options KDB options DDB #Enable the kernel debugger #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O -options XSCALE_CACHE_READ_WRITE_ALLOCATE -device md +options XSCALE_CACHE_READ_WRITE_ALLOCATE +device md device random # Entropy device -options ARM_USE_SMALL_ALLOC +options ARM_USE_SMALL_ALLOC # Floppy drives -options INCLUDE_CONFIG_FILE # Include this file in kernel -#options VERBOSE_SYSINIT -options VERBOSE_INIT_ARM +options INCLUDE_CONFIG_FILE # Include this file in kernel +#options VERBOSE_SYSINIT +options VERBOSE_INIT_ARM -device bpf -#options ROOTDEVNAME=\"ufs:ad4s1a\" +device bpf +#options ROOTDEVNAME=\"ufs:ad4s1a\" diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX index 05172ca3900b..864a4f5caf70 100644 --- a/sys/arm/conf/GUMSTIX +++ b/sys/arm/conf/GUMSTIX @@ -27,18 +27,18 @@ cpu CPU_XSCALE_PXA2X0 hints "GUMSTIX.hints" options PHYSADDR=0xa0000000 -options KERNPHYSADDR=0xa0200000 -options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +options KERNPHYSADDR=0xa0200000 +options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm -options STARTUP_PAGETABLE_ADDR=0xa0000000 +options STARTUP_PAGETABLE_ADDR=0xa0000000 include "../xscale/pxa/std.pxa" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options HZ=100 -#options DEVICE_POLLING +options HZ=100 +#options DEVICE_POLLING options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -62,13 +62,13 @@ options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options BOOTP -options BOOTP_NFSROOT -options BOOTP_WIRED_TO=smc0 -options BOOTP_COMPAT -options BOOTP_NFSV3 -options BOOTP_BLOCKSIZE=4096 -options PREEMPTION +options BOOTP +options BOOTP_NFSROOT +options BOOTP_WIRED_TO=smc0 +options BOOTP_COMPAT +options BOOTP_NFSV3 +options BOOTP_BLOCKSIZE=4096 +options PREEMPTION device loop device ether device mii @@ -80,7 +80,7 @@ device uart_ns8250 device pty # Debugging for use in -current -options KDB +options KDB options DDB #Enable the kernel debugger #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS @@ -89,4 +89,4 @@ options DDB #Enable the kernel debugger #options DIAGNOSTIC device md -device random # Entropy device +device random # Entropy device diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200 index de322ec66de1..61f74cf6287f 100644 --- a/sys/arm/conf/HL200 +++ b/sys/arm/conf/HL200 @@ -26,8 +26,8 @@ hints "KB920X.hints" makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -44,7 +44,7 @@ options NFSCLIENT #Network Filesystem Client #options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT options BOOTP_NFSROOT -options BOOTP +options BOOTP options BOOTP_NFSV3 options BOOTP_WIRED_TO=ate0 options BOOTP_COMPAT @@ -61,7 +61,7 @@ options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions #options SYSCTL_OMIT_DESCR options MUTEX_NOINLINE -options RWLOCK_NOINLINE +options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING device random @@ -94,23 +94,23 @@ device icee device bpf # USB support -device ohci # OHCI localbus->USB interface -device usb # USB Bus (required) -#device udbp # USB Double Bulk Pipe devices -device uhid # "Human Interface Devices" -device ulpt # Printer -device umass # Disks/Mass storage - Requires scbus and da -device ural # Ralink Technology RT2500USB wireless NICs -device rum # Ralink Technology RT2501USB wireless NICs -device urio # Diamond Rio 500 MP3 player +device ohci # OHCI localbus->USB interface +device usb # USB Bus (required) +#device udbp # USB Double Bulk Pipe devices +device uhid # "Human Interface Devices" +device ulpt # Printer +device umass # Disks/Mass storage - Requires scbus and da +device ural # Ralink Technology RT2500USB wireless NICs +device rum # Ralink Technology RT2501USB wireless NICs +device urio # Diamond Rio 500 MP3 player # USB Ethernet, requires miibus device 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 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 # usb serial device uark @@ -122,13 +122,13 @@ device uplcom device uvisor device uvscom # SCSI peripherals -device scbus # SCSI bus (required for SCSI) -device da # Direct Access (disks) -device cd # CD -device pass # Passthrough device (direct SCSI access) +device scbus # SCSI bus (required for SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct SCSI access) # Wireless NIC cards -device wlan # 802.11 support -device wlan_wep # 802.11 WEP support -device wlan_ccmp # 802.11 CCMP support -device wlan_tkip # 802.11 TKIP support -device wlan_amrr # AMRR transmit rate control algorithm +device wlan # 802.11 support +device wlan_wep # 802.11 WEP support +device wlan_ccmp # 802.11 CCMP support +device wlan_tkip # 802.11 TKIP support +device wlan_amrr # AMRR transmit rate control algorithm diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244 index d3c225bc8d51..e8ed9e872338 100644 --- a/sys/arm/conf/IQ31244 +++ b/sys/arm/conf/IQ31244 @@ -20,10 +20,10 @@ ident IQ31244 options PHYSADDR=0xa0000000 -options KERNPHYSADDR=0xa0200000 -options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm -options FLASHADDR=0xf0000000 -options LOADERRAMADDR=0x00000000 +options KERNPHYSADDR=0xa0200000 +options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +options FLASHADDR=0xf0000000 +options LOADERRAMADDR=0x00000000 options STARTUP_PAGETABLE_ADDR=0xa0000000 include "../xscale/i80321/std.iq31244" @@ -33,8 +33,8 @@ makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale -options HZ=100 -#options DEVICE_POLLING +options HZ=100 +#options DEVICE_POLLING options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -58,12 +58,12 @@ options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=em0 -options BOOTP_COMPAT -#options PREEMPTION +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=em0 +options BOOTP_COMPAT +#options PREEMPTION device loop device ether #device saarm @@ -74,12 +74,12 @@ device uart device pci device ata -device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering +device atadisk # ATA disk drives +device ataraid # ATA RAID drives +device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives +device atapist # ATAPI tape drives +options ATA_STATIC_ID # Static device numbering # SCSI Controllers @@ -94,21 +94,21 @@ device "iq31244_7seg" # IQ31244 7 seg # output. Adds ~215k to driver. # Debugging for use in -current -options KDB +options KDB options DDB #Enable the kernel debugger #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O -options XSCALE_CACHE_READ_WRITE_ALLOCATE -device md -device random # Entropy device +options XSCALE_CACHE_READ_WRITE_ALLOCATE +device md +device random # Entropy device -options ARM_USE_SMALL_ALLOC +options ARM_USE_SMALL_ALLOC # Floppy drives diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X index 1f688f809af6..31f009622445 100644 --- a/sys/arm/conf/KB920X +++ b/sys/arm/conf/KB920X @@ -95,40 +95,40 @@ device icee device bpf # USB support -device ohci # OHCI localbus->USB interface -device usb # USB Bus (required) -#device udbp # USB Double Bulk Pipe devices -device uhid # "Human Interface Devices" -device ulpt # Printer -device umass # Disks/Mass storage - Requires scbus and da -device ural # Ralink Technology RT2500USB wireless NICs -device rum # Ralink Technology RT2501USB wireless NICs -device urio # Diamond Rio 500 MP3 player +device ohci # OHCI localbus->USB interface +device usb # USB Bus (required) +#device udbp # USB Double Bulk Pipe devices +device uhid # "Human Interface Devices" +device ulpt # Printer +device umass # Disks/Mass storage - Requires scbus and da +device ural # Ralink Technology RT2500USB wireless NICs +device rum # Ralink Technology RT2501USB wireless NICs +device urio # Diamond Rio 500 MP3 player # USB Ethernet, requires miibus device 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 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 # usb serial -device uark -device ubsa -device uftdi -device uipaq -device uplcom -device uvisor -device uvscom +device uark +device ubsa +device uftdi +device uipaq +device uplcom +device uvisor +device uvscom # SCSI peripherals -device scbus # SCSI bus (required for SCSI) -device da # Direct Access (disks) -device cd # CD -device pass # Passthrough device (direct SCSI access) +device scbus # SCSI bus (required for SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct SCSI access) # Wireless NIC cards -device wlan # 802.11 support -device wlan_wep # 802.11 WEP support -device wlan_ccmp # 802.11 CCMP support -device wlan_tkip # 802.11 TKIP support -device wlan_amrr # AMRR transmit rate control algorithm +device wlan # 802.11 support +device wlan_wep # 802.11 WEP support +device wlan_ccmp # 802.11 CCMP support +device wlan_tkip # 802.11 TKIP support +device wlan_amrr # AMRR transmit rate control algorithm diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU index 614a8a06b91c..f14a77969197 100644 --- a/sys/arm/conf/NSLU +++ b/sys/arm/conf/NSLU @@ -104,7 +104,7 @@ device pty device loop device md -device random # Entropy device +device random # Entropy device #options ARM_USE_SMALL_ALLOC diff --git a/sys/arm/conf/SIMICS b/sys/arm/conf/SIMICS index ef1ccb06780f..e225795f689b 100644 --- a/sys/arm/conf/SIMICS +++ b/sys/arm/conf/SIMICS @@ -29,8 +29,8 @@ makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=strongarm -options DDB -options KDB +options DDB +options KDB options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -40,7 +40,7 @@ options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device -options ROOTDEVNAME=\"ufs:md0\" +options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server options NFSLOCKD #Network Lock Manager @@ -68,4 +68,4 @@ device uart #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device md +device md diff --git a/sys/arm/conf/SKYEYE b/sys/arm/conf/SKYEYE index 007d49e3bf83..56fa39c738d0 100644 --- a/sys/arm/conf/SKYEYE +++ b/sys/arm/conf/SKYEYE @@ -20,9 +20,9 @@ ident KB920X -options KERNPHYSADDR=0xc0000000 -options KERNVIRTADDR=0xc0000000 -options PHYSADDR=0xc0000000 +options KERNPHYSADDR=0xc0000000 +options KERNVIRTADDR=0xc0000000 +options PHYSADDR=0xc0000000 include "../at91/std.kb920x" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. @@ -30,8 +30,8 @@ makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=arm9 -options DDB -options KDB +options DDB +options KDB options SCHED_4BSD #4BSD scheduler @@ -42,8 +42,8 @@ options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device -options MD_ROOT_SIZE=4096 -options ROOTDEVNAME=\"ufs:md0\" +options MD_ROOT_SIZE=4096 +options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server options NFSLOCKD #Network Lock Manager @@ -79,8 +79,8 @@ device uart #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O -device md -options SKYEYE_WORKAROUNDS +device md +options SKYEYE_WORKAROUNDS # Floppy drives diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 185ff8f2a6a4..7ba6ac497479 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -192,7 +192,7 @@ options ROOTDEVNAME=\"ufs:da0s2e\" # tree at 'kern.sched.stats' and is useful for debugging scheduling decisions. # options SCHED_4BSD -options SCHED_STATS +options SCHED_STATS #options SCHED_ULE ##################################################################### @@ -504,7 +504,7 @@ options STACK # Additional configuration options may be required on specific architectures, # please see hwpmc(4). -device hwpmc # Driver (also a loadable module) +device hwpmc # Driver (also a loadable module) options HWPMC_HOOKS # Other necessary kernel hooks @@ -517,7 +517,7 @@ options HWPMC_HOOKS # Other necessary kernel hooks options INET #Internet communications protocols options INET6 #IPv6 communications protocols -options ROUTETABLES=2 # max 16. 1 is back compatible. +options ROUTETABLES=2 # max 16. 1 is back compatible. # In order to enable IPSEC you MUST also add device crypto to # your kernel configuration @@ -551,10 +551,10 @@ options NETSMB #SMB/CIFS requester options LIBMCHAIN # libalias library, performing NAT -options LIBALIAS +options LIBALIAS # flowtable cache -options FLOWTABLE +options FLOWTABLE # # SCTP is a NEW transport protocol defined by @@ -571,7 +571,7 @@ options FLOWTABLE # the V6 and V4.. since an association can span # both a V6 and V4 address at the SAME time :-) # -options SCTP +options SCTP # There are bunches of options: # this one turns on all sorts of # nastly printing that you can @@ -583,7 +583,7 @@ options SCTP # option we don't do any of the tests for # bits and prints.. which makes the code run # faster.. if you are not debugging don't use. -options SCTP_DEBUG +options SCTP_DEBUG # # This option turns off the CRC32c checksum. Basically # You will not be able to talk to anyone else that @@ -596,7 +596,7 @@ options SCTP_DEBUG # splitting 8's algorithm its not as bad as it used # to be.. but it does speed things up try only # for in a captured lab environment :-) -options SCTP_WITH_NO_CSUM +options SCTP_WITH_NO_CSUM # # @@ -619,7 +619,7 @@ options SCTP_LOCK_LOGGING options SCTP_MBUF_LOGGING options SCTP_MBCNT_LOGGING options SCTP_PACKET_LOGGING -options SCTP_LTRACE_CHUNKS +options SCTP_LTRACE_CHUNKS options SCTP_LTRACE_ERRORS @@ -644,7 +644,7 @@ options ALTQ_DEBUG # It allows transparent proxies to pretend to be other machines. # How the packet GET to that machine is a problem solved elsewhere, # smart routers, ipfw fwd, etc. -options IP_NONLOCALBIND # Allow impersonation for proxies. +options IP_NONLOCALBIND # Allow impersonation for proxies. # netgraph(4). Enable the base netgraph code with the NETGRAPH option. # Individual node types can be enabled with the corresponding option @@ -734,8 +734,8 @@ device vlan # drivers, including host AP mode; it is MANDATORY for the wi, # and ath drivers and will eventually be required by all 802.11 drivers. device wlan -options IEEE80211_DEBUG #enable debugging msgs -options IEEE80211_AMPDU_AGE #age frames in AMPDU reorder q's +options IEEE80211_DEBUG #enable debugging msgs +options IEEE80211_AMPDU_AGE #age frames in AMPDU reorder q's # The `wlan_wep', `wlan_tkip', and `wlan_ccmp' devices provide # support for WEP, TKIP, and AES-CCMP crypto protocols optionally @@ -905,7 +905,7 @@ options TCPDEBUG # return a logarithmic histogram of monitored parameters # (e.g. packet size, wasted space, number of mbufs in chain). options MBUF_STRESS_TEST -options MBUF_PROFILING +options MBUF_PROFILING # Statically Link in accept filters options ACCEPT_FILTER_DATA @@ -962,7 +962,7 @@ options FDESCFS #File descriptor filesystem options HPFS #OS/2 File system options MSDOSFS #MS DOS File System (FAT, FAT32) options NFSSERVER #Network File System server -options NFSLOCKD #Network Lock Manager +options NFSLOCKD #Network Lock Manager # NT File System. Read-mostly, see mount_ntfs(8) for details. # For a full read-write NTFS support consider sysutils/fusefs-ntfs @@ -1397,8 +1397,8 @@ options SC_NO_SUSPEND_VTYSWITCH # 0x100 Probe for a keyboard device periodically if one is not present # Enable experimental features of the syscons terminal emulator (teken). -options TEKEN_UTF8 # UTF-8 output handling -options TEKEN_XTERM # xterm-style terminal emulation +options TEKEN_UTF8 # UTF-8 output handling +options TEKEN_XTERM # xterm-style terminal emulation # # Optional devices: @@ -1524,7 +1524,7 @@ options ADW_ALLOW_MEMIO # Options used in dev/iscsi (Software iSCSI stack) # -options ISCSI_INITIATOR_DEBUG=9 +options ISCSI_INITIATOR_DEBUG=9 # Options used in dev/isp/ (Qlogic SCSI/FC driver). # @@ -1618,7 +1618,7 @@ device mly device ida # Compaq Smart RAID device mlx # Mylex DAC960 device amr # AMI MegaRAID -device amrp # SCSI Passthrough interface (optional, CAM req.) +device amrp # SCSI Passthrough interface (optional, CAM req.) device mfi # LSI MegaRAID SAS device mfip # LSI MegaRAID SAS passthrough, requires CAM options MFI_DEBUG @@ -2348,7 +2348,7 @@ options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info options BOOTP_NFSV3 # Use NFS v3 to NFS mount root options BOOTP_COMPAT # Workaround for broken bootp daemons. options BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP -options BOOTP_BLOCKSIZE=8192 # Override NFS block size +options BOOTP_BLOCKSIZE=8192 # Override NFS block size # # Add software watchdog routines. @@ -2393,7 +2393,7 @@ device ohci # EHCI controller device ehci # SL811 Controller -#device slhci +#device slhci # General USB code (mandatory for USB) device usb # @@ -2490,7 +2490,7 @@ device zyd # debugging options for the USB subsystem # options USB_DEBUG -options U3G_DEBUG +options U3G_DEBUG # options for ukbd: options UKBD_DFLT_KEYMAP # specify the built-in keymap diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index 03fbf36a9ab5..b94ef53e9f99 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -7,7 +7,7 @@ machine i386 # Bus support. device isa -options ISAPNP +options ISAPNP # Floating point support. device npx @@ -29,4 +29,4 @@ options GEOM_PART_MBR options NATIVE device atpic -options FLOWTABLE +options FLOWTABLE diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index df00de1ca4bf..7475efd48c2f 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -69,7 +69,7 @@ options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -117,7 +117,7 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug device amd # AMD 53C974 (Tekram DC-390(T)) device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module +#device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -272,7 +272,7 @@ device wlan_amrr # AMRR transmit rate control algorithm device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index b9c3fd113a83..9fc7ab6fe6fe 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -49,7 +49,7 @@ options MP_WATCHDOG # Debugging options. # -options STOP_NMI # Stop CPUS using NMI instead of IPI +options STOP_NMI # Stop CPUS using NMI instead of IPI options COUNT_XINVLTLB_HITS # Counters for TLB events options COUNT_IPIS # Per-CPU IPI interrupt counters @@ -225,7 +225,7 @@ options PERFMON # include both in your kernel; you will not get any video output. Ordinary # PC's do not suffer from this. # -options XBOX +options XBOX device xboxfb @@ -253,7 +253,7 @@ options DEVICE_POLLING # BPF_JITTER adds support for BPF just-in-time compiler. -options BPF_JITTER +options BPF_JITTER ##################################################################### @@ -348,7 +348,7 @@ device pci device agp # AGP debugging. -options AGP_DEBUG +options AGP_DEBUG ##################################################################### @@ -484,7 +484,7 @@ device acpi_asus device acpi_fujitsu # ACPI extras driver for IBM laptops -device acpi_ibm +device acpi_ibm # ACPI Panasonic Extras (LCD backlight/brightness, video output, etc.) device acpi_panasonic @@ -569,7 +569,7 @@ device ath_hal # pci/cardbus chip support #device ath_rf5112 #device ath_rf5413 #device ath_ar5416 # AR5416 chips -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ce device cp @@ -846,7 +846,7 @@ options LINPROCFS #Enable the linux-like sys filesystem support (requires COMPAT_LINUX # and PSEUDOFS) -options LINSYSFS +options LINSYSFS # # SysVR4 ABI emulation @@ -921,4 +921,4 @@ options VM_KMEM_SIZE_SCALE # asr old ioctls support, needed by raidutils -options ASR_COMPAT +options ASR_COMPAT diff --git a/sys/i386/conf/PAE b/sys/i386/conf/PAE index be8616ef43e7..5e69a593e6ef 100644 --- a/sys/i386/conf/PAE +++ b/sys/i386/conf/PAE @@ -8,7 +8,7 @@ include GENERIC ident PAE-GENERIC # To make a PAE kernel, the next option is needed -options PAE # Physical Address Extensions Kernel +options PAE # Physical Address Extensions Kernel # Compile acpi in statically since the module isn't built properly. Most # machines which support large amounts of memory require acpi. diff --git a/sys/i386/conf/XBOX b/sys/i386/conf/XBOX index 0a2e8c042085..96719659ed1f 100644 --- a/sys/i386/conf/XBOX +++ b/sys/i386/conf/XBOX @@ -10,14 +10,14 @@ makeoptions MODULES_OVERRIDE="" options KDB options DDB -options XBOX # kernel is for XBOX +options XBOX # kernel is for XBOX device xboxfb # frame buffer support (REQUIRED!) device sc # syscons device fb # no support yet for root device name fetching -options ROOTDEVNAME=\"ufs:ad0s1a\" -#options ROOTDEVNAME=\"cd9660:acd0\" +options ROOTDEVNAME=\"ufs:ad0s1a\" +#options ROOTDEVNAME=\"cd9660:acd0\" options SCHED_4BSD # 4BSD scheduler options INET # InterNETworking diff --git a/sys/i386/conf/XEN b/sys/i386/conf/XEN index 7ddc776d8cb7..6c949663f82c 100644 --- a/sys/i386/conf/XEN +++ b/sys/i386/conf/XEN @@ -11,7 +11,7 @@ makeoptions MODULES_OVERRIDE="" options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption -#options SCHED_4BSD +#options SCHED_4BSD options INET # InterNETworking options INET6 # IPv6 communications protocols @@ -54,22 +54,22 @@ options INVARIANT_SUPPORT # Extra sanity checks of internal structures, require options WITNESS # Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options PAE +options PAE nooption NATIVE option XEN nodevice atpic nodevice isa -options MCLSHIFT=12 +options MCLSHIFT=12 # To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel device apic # I/O APIC -device atkbdc # AT keyboard controller -device atkbd # AT keyboard -device psm # PS/2 mouse -device pci +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse +device pci device kbdmux # keyboard multiplexer diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS index 1a96cd6b7519..625ff90955cc 100644 --- a/sys/ia64/conf/DEFAULTS +++ b/sys/ia64/conf/DEFAULTS @@ -6,7 +6,7 @@ machine ia64 # Bus support. -device acpi # ACPI support +device acpi # ACPI support # Pseudo devices. device mem # Memory and kernel memory devices diff --git a/sys/ia64/conf/NOTES b/sys/ia64/conf/NOTES index 138396aeaa70..873199a61b01 100644 --- a/sys/ia64/conf/NOTES +++ b/sys/ia64/conf/NOTES @@ -15,7 +15,7 @@ cpu ITANIUM2 # option: COMPAT_IA32 # This option enables the support for execution of i386 (32-bit) programs on # ia64. It is based on the ia32 emulation in the processor. -options COMPAT_IA32 +options COMPAT_IA32 # option: LOG2_ID_PAGE_SIZE # Specify the log2 size of the identity (direct) mappings in regions 6 and 7 @@ -25,20 +25,20 @@ options LOG2_ID_PAGE_SIZE=27 # 128M # option: LOG2_PAGE_SIZE # Specify the log2 size of the page to be used for virtual memory management. # The page size being equal to 1<<LOG2_PAGE_SIZE. -options LOG2_PAGE_SIZE=15 # 32K +options LOG2_PAGE_SIZE=15 # 32K # option: SKI # Build support for running under the ski simulator. -options SKI +options SKI # option: UWX_TRACE_ENABLE # Build the unwinder with tracing support. This option is used to debug the # unwinder itself and the glue around it. -options UWX_TRACE_ENABLE +options UWX_TRACE_ENABLE # MI options -options ACPI_DEBUG -options KSTACK_PAGES=3 +options ACPI_DEBUG +options KSTACK_PAGES=3 device acpi @@ -102,7 +102,7 @@ options VGA_WIDTH90 # support 90 column modes options VGA_DEBUG # AGP debugging. -options AGP_DEBUG +options AGP_DEBUG # The following devices are not supported. nodevice fdc diff --git a/sys/mips/conf/ADM5120 b/sys/mips/conf/ADM5120 index a03d102251c1..466289dc7e8b 100644 --- a/sys/mips/conf/ADM5120 +++ b/sys/mips/conf/ADM5120 @@ -25,41 +25,41 @@ makeoptions MIPS_LITTLE_ENDIAN=defined # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" -options KERNVIRTADDR=0x80100000 +options KERNVIRTADDR=0x80100000 include "../adm5120/std.adm5120" hints "ADM5120.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options PSEUDOFS #Pseudo-filesystem framework -# options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCLIENT #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options PSEUDOFS #Pseudo-filesystem framework +#options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=admsw0 -options BOOTP_COMPAT +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=admsw0 +options BOOTP_COMPAT -# options FFS #Berkeley Fast Filesystem -# options SOFTUPDATES #Enable FFS soft updates support -# options UFS_ACL #Support for access control lists -# options UFS_DIRHASH #Improve performance on big directories -options ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\" +#options FFS #Berkeley Fast Filesystem +#options SOFTUPDATES #Enable FFS soft updates support +#options UFS_ACL #Support for access control lists +#options UFS_DIRHASH #Improve performance on big directories +options ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\" # Debugging for use in -current -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS #Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device loop device ether diff --git a/sys/mips/conf/IDT b/sys/mips/conf/IDT index 7848c6566a86..3082d1c1a650 100644 --- a/sys/mips/conf/IDT +++ b/sys/mips/conf/IDT @@ -11,24 +11,24 @@ hints "IDT.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options PSEUDOFS #Pseudo-filesystem framework +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCLIENT #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options PSEUDOFS #Pseudo-filesystem framework -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=kr0 -options BOOTP_COMPAT +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=kr0 +options BOOTP_COMPAT # Debugging for use in -current -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS device loop device pci @@ -45,8 +45,8 @@ device wlan_wep # 802.11 WEP support device wlan_tkip # 802.11 TKIP support device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath -options ATH_DEBUG +options ATH_DEBUG device bpf diff --git a/sys/mips/conf/MALTA b/sys/mips/conf/MALTA index 9771c55351e9..d4ce4461651d 100644 --- a/sys/mips/conf/MALTA +++ b/sys/mips/conf/MALTA @@ -22,14 +22,14 @@ ident MALTA #makeoptions ARCH_FLAGS=-march=mips32 makeoptions MIPS_LITTLE_ENDIAN=defined -options YAMON +options YAMON # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" -options KERNVIRTADDR=0x80100000 -options TICK_USE_YAMON_FREQ=defined -#options TICK_USE_MALTA_RTC=defined +options KERNVIRTADDR=0x80100000 +options TICK_USE_YAMON_FREQ=defined +#options TICK_USE_MALTA_RTC=defined include "../malta/std.malta" @@ -37,28 +37,28 @@ hints "MALTA.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCLIENT #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options FFS #Berkeley Fast Filesystem -options SOFTUPDATES #Enable FFS soft updates support -options UFS_ACL #Support for access control lists -options UFS_DIRHASH #Improve performance on big directories -options ROOTDEVNAME=\"ufs:ad0s1a\" +options FFS #Berkeley Fast Filesystem +options SOFTUPDATES #Enable FFS soft updates support +options UFS_ACL #Support for access control lists +options UFS_DIRHASH #Improve performance on big directories +options ROOTDEVNAME=\"ufs:ad0s1a\" # Debugging for use in -current -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS #Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device loop device ether diff --git a/sys/mips/conf/QEMU b/sys/mips/conf/QEMU index 0a2b122570bc..64a33aee57d6 100644 --- a/sys/mips/conf/QEMU +++ b/sys/mips/conf/QEMU @@ -27,28 +27,28 @@ makeoptions ARCH_FLAGS=-march=mips32 # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" -options KERNVIRTADDR=0x80100000 +options KERNVIRTADDR=0x80100000 include "../adm5120/std.adm5120" #hints "GENERIC.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCLIENT #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions # Debugging for use in -current -#options INVARIANTS #Enable calls of extra sanity checking -#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +#options INVARIANTS #Enable calls of extra sanity checking +#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS #Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device loop device ether diff --git a/sys/mips/conf/SENTRY5 b/sys/mips/conf/SENTRY5 index 7611e44bb7eb..bc2438a7228e 100644 --- a/sys/mips/conf/SENTRY5 +++ b/sys/mips/conf/SENTRY5 @@ -26,9 +26,9 @@ ident SENTRY5 cpu CPU_MIPS4KC -options CPU_NOFPU +options CPU_NOFPU options ISA_MIPS32 -options CPU_SENTRY5 # XXX should this be a +options CPU_SENTRY5 # XXX should this be a # sub-cpu option? # XXX only siba should be hardwired for now; we will use @@ -37,14 +37,14 @@ files "../sentry5/files.sentry5" hints "SENTRY5.hints" # sentry5 normally ships with cfe firmware; use the console for now -options CFE -options CFE_CONSOLE -options ALT_BREAK_TO_DEBUGGER +options CFE +options CFE_CONSOLE +options ALT_BREAK_TO_DEBUGGER # cfe loader expects kernel at 0x80001000 for mips32 w/o backwards # offsets in the linked elf image (see ldscript hack) # XXX can we conditionalize the linker stuff on options CFE? -options KERNVIRTADDR=0x80001000 +options KERNVIRTADDR=0x80001000 makeoptions LDSCRIPT_NAME= ldscript.mips.cfe @@ -53,21 +53,21 @@ makeoptions MIPS_LITTLE_ENDIAN=defined makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions MODULES_OVERRIDE="" -options DDB -options KDB +options DDB +options KDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCLIENT #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions # Debugging for use in -current -options INVARIANTS -options INVARIANT_SUPPORT +options INVARIANTS +options INVARIANT_SUPPORT -#options BUS_DEBUG +#options BUS_DEBUG #makeoptions BUS_DEBUG device siba # Sonics SiliconBackplane @@ -80,7 +80,7 @@ device miibus # attachments # notyet: #device ath # in pci slot #device ath_hal # pci chip support -#options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +#options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device usb # USB Bus (required) device uhci # UHCI PCI->USB interface diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS index c16a29b3b8dd..0002cf0a30cc 100644 --- a/sys/pc98/conf/DEFAULTS +++ b/sys/pc98/conf/DEFAULTS @@ -8,7 +8,7 @@ options PC98 # Bus support. device isa -options ISAPNP +options ISAPNP # Floating point support. device npx diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES index 34823daaf0fd..02f8d07ecf29 100644 --- a/sys/pc98/conf/NOTES +++ b/sys/pc98/conf/NOTES @@ -31,7 +31,7 @@ options MP_WATCHDOG # Debugging options. # -options STOP_NMI # Stop CPUS using NMI instead of IPI +options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -193,7 +193,7 @@ options DEVICE_POLLING # BPF_JITTER adds support for BPF just-in-time compiler. -options BPF_JITTER +options BPF_JITTER ##################################################################### @@ -295,7 +295,7 @@ device pci device agp # AGP debugging. -options AGP_DEBUG +options AGP_DEBUG ##################################################################### @@ -437,7 +437,7 @@ device ath_hal # pci/cardbus chip support #device ath_rf5112 #device ath_rf5413 #device ath_ar5416 # AR5416 chips -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath # diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index a85ded05e8f9..36231c7fe273 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -135,7 +135,7 @@ device ehci # EHCI PCI->USB interface device usb # USB Bus (required) device uhid # "Human Interface Devices" device ukbd # Keyboard -options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options KBD_INSTALL_CDEV # install a CDEV entry in /dev device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da0 device ums # Mouse diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX index 901d18c77b58..b517ee1e68fb 100644 --- a/sys/powerpc/conf/MPC85XX +++ b/sys/powerpc/conf/MPC85XX @@ -22,8 +22,8 @@ options BOOTP_WIRED_TO=tsec0 options CD9660 options COMPAT_43 options DDB -options DEVICE_POLLING -options HZ=1000 +options DEVICE_POLLING +options HZ=1000 #options DIAGNOSTIC options FFS options GDB @@ -39,7 +39,7 @@ options MPC85XX options MSDOSFS options NFS_ROOT options NFSCLIENT -options NFSLOCKD +options NFSLOCKD options PROCFS options PSEUDOFS options SCHED_4BSD diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES index e78a0425e57e..c22d86ff824f 100644 --- a/sys/powerpc/conf/NOTES +++ b/sys/powerpc/conf/NOTES @@ -19,7 +19,7 @@ options FPU_EMU options POWERMAC #NewWorld Apple PowerMacs options PSIM #GDB PSIM ppc simulator -options SC_OFWFB # OFW frame buffer +options SC_OFWFB # OFW frame buffer # Standard busses device pci diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index 46c363ea4803..e1c80547ef19 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -200,7 +200,7 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath # Pseudo devices. |