diff options
author | kuriyama <kuriyama@FreeBSD.org> | 2009-05-10 00:00:25 +0000 |
---|---|---|
committer | kuriyama <kuriyama@FreeBSD.org> | 2009-05-10 00:00:25 +0000 |
commit | 9913dad78324dd8bc8da927e4b1d87003ecfe7d9 (patch) | |
tree | 200771cd75bef85df04e89efbd2c006e84a82b8b /sys/i386/conf | |
parent | eab6ae7b1f135a724251917287e1da0b659b63d3 (diff) | |
download | FreeBSD-src-9913dad78324dd8bc8da927e4b1d87003ecfe7d9.zip FreeBSD-src-9913dad78324dd8bc8da927e4b1d87003ecfe7d9.tar.gz |
- Use "device\t" and "options \t" for consistency.
Diffstat (limited to 'sys/i386/conf')
-rw-r--r-- | sys/i386/conf/DEFAULTS | 4 | ||||
-rw-r--r-- | sys/i386/conf/GENERIC | 6 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 16 | ||||
-rw-r--r-- | sys/i386/conf/PAE | 2 | ||||
-rw-r--r-- | sys/i386/conf/XBOX | 6 | ||||
-rw-r--r-- | sys/i386/conf/XEN | 14 |
6 files changed, 24 insertions, 24 deletions
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index 03fbf36..b94ef53 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 df00de1..7475efd 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 b9c3fd1..9fc7ab6 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 be8616e..5e69a59 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 0a2e8c0..9671965 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 7ddc776..6c949663 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 |