Module Name: src
Committed By: tsutsui
Date: Sat Nov 21 12:09:15 UTC 2009
Modified Files:
src/sys/arch/i386/conf: GENERIC
Log Message:
- use options<space><tab>
- remove an extra whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.950 -r1.951 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.950 src/sys/arch/i386/conf/GENERIC:1.951
--- src/sys/arch/i386/conf/GENERIC:1.950 Sat Oct 3 13:37:27 2009
+++ src/sys/arch/i386/conf/GENERIC Sat Nov 21 12:09:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.950 2009/10/03 13:37:27 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.951 2009/11/21 12:09:15 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,15 +22,15 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.950 $"
+#ident "GENERIC-$Revision: 1.951 $"
maxusers 64 # estimated number of users
# For GENERIC, we build the exec formats as modules by default.
-no options EXEC_AOUT # exec a.out binaries
-no options EXEC_ELF32 # exec ELF binaries
-no options EXEC_SCRIPT # exec #! scripts
-no options COREDUMP
+no options EXEC_AOUT # exec a.out binaries
+no options EXEC_ELF32 # exec ELF binaries
+no options EXEC_SCRIPT # exec #! scripts
+no options COREDUMP
# CPU-related options.
options VM86 # virtual 8086 emulation
@@ -97,10 +97,10 @@
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
#options P1003_1B_SEMAPHORE # p1003.1b semaphore support
-no options AIO # POSIX asynchronous I/O, built as a module
-no options MQUEUE # POSIX messsage queues, built as a module
+no options AIO # POSIX asynchronous I/O, built as a module
+no options MQUEUE # POSIX messsage queues, built as a module
-options MODULAR # new style module framework
+options MODULAR # new style module framework
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
@@ -305,8 +305,8 @@
#options SPLASHSCREEN_PROGRESS
# Keylock support
-#options KEYLOCK
-#options secmodel_keylock # Requires options KEYLOCK
+#options KEYLOCK
+#options secmodel_keylock # Requires options KEYLOCK
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
@@ -811,7 +811,7 @@
hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
iteide* at pci? dev ? function ? # IT Express IDE controllers
ixpide* at pci? dev ? function ? # ATI IXP IDE controllers
-jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
+jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
ahcisata* at jmide?
mvsata* at pci? dev ? function ? # Marvell Hercules-I/II
optiide* at pci? dev ? function ? # Opti IDE controllers
@@ -847,7 +847,7 @@
# ATA (IDE) bus support
atabus* at ata?
-options ATADEBUG
+options ATADEBUG
# IDE drives
# Flags are used only with controllers that support DMA operations
@@ -1491,8 +1491,8 @@
pseudo-device fss 4 # file system snapshot device
pseudo-device md 1 # memory disk device (ramdisk)
-options MEMORY_DISK_HOOKS # enable root ramdisk
-options MEMORY_DISK_DYNAMIC # loaded via kernel module
+options MEMORY_DISK_HOOKS # enable root ramdisk
+options MEMORY_DISK_DYNAMIC # loaded via kernel module
pseudo-device vnd # disk-like interface to files
options VND_COMPRESSION # compressed vnd(4)
