Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some comments, tabs or indenting, and some ordering

Browse Source 
to make this easier to diff with the GENERIC config.

No real changes.
This commit is contained in:
reed 2006-08-02 16:20:45 +00:00
parent d9e2b32d75
commit 35728fe8e7
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/arch/i386/conf/GENERIC_LAPTOP
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_LAPTOP,v 1.194 2006/07/31 23:30:52 hubertf Exp $ # $NetBSD: GENERIC_LAPTOP,v 1.195 2006/08/02 16:20:45 reed Exp $
# From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp # From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
# #
# GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled # GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary #options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.194 $" #ident "GENERIC-$Revision: 1.195 $"
maxusers 32 # estimated number of users maxusers 32 # estimated number of users
@ -102,7 +102,7 @@ options COMPAT_14 # NetBSD 1.4
options COMPAT_15 # NetBSD 1.5 options COMPAT_15 # NetBSD 1.5
options COMPAT_16 # NetBSD 1.6 options COMPAT_16 # NetBSD 1.6
options COMPAT_20 # NetBSD 2.0 options COMPAT_20 # NetBSD 2.0
options COMPAT_30 # NetBSD 3.0 compatibility. options COMPAT_30 # NetBSD 3.0
options COMPAT_43 # 4.3BSD, 386BSD, and BSDI options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
options COMPAT_386BSD_MBRPART # recognize old partition ID options COMPAT_386BSD_MBRPART # recognize old partition ID
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
@ -136,7 +136,7 @@ file-system UMAPFS # NULLFS + uid and gid remapping
file-system UNION # union file system file-system UNION # union file system
file-system CODA # Coda File System; also needs vcoda (below) file-system CODA # Coda File System; also needs vcoda (below)
file-system SMBFS # experimental - CIFS; also needs nsmb (below) file-system SMBFS # experimental - CIFS; also needs nsmb (below)
file-system PTYFS # /dev/pts/N support file-system PTYFS # /dev/ptm support
#file-system TMPFS # experimental - Efficient memory file-system #file-system TMPFS # experimental - Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system
@ -216,7 +216,7 @@ options WS_KERNEL_FG=WSCOL_GREEN
#options WS_KERNEL_COLATTR="" #options WS_KERNEL_COLATTR=""
#options WS_KERNEL_MONOATTR="" #options WS_KERNEL_MONOATTR=""
# customization of console border color # customization of console border color
options WSDISPLAY_CUSTOM_BORDER # border customization from wsconsctl(8) options WSDISPLAY_CUSTOM_BORDER # custom border colors via wsconsctl(8)
#options WSDISPLAY_BORDER_COLOR=WSCOL_BLUE # default color #options WSDISPLAY_BORDER_COLOR=WSCOL_BLUE # default color
# compatibility to other console drivers # compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
@ -230,10 +230,10 @@ options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
#options WSDISPLAY_DEFAULTSCREENS=4 #options WSDISPLAY_DEFAULTSCREENS=4
# use a large software cursor that doesn't blink # use a large software cursor that doesn't blink
options PCDISPLAY_SOFTCURSOR options PCDISPLAY_SOFTCURSOR
# console scrolling support.
options WSDISPLAY_SCROLLSUPPORT
# modify the screen type of the console; defaults to "80x25" # modify the screen type of the console; defaults to "80x25"
#options VGA_CONSOLE_SCREENTYPE="\"80x24\"" #options VGA_CONSOLE_SCREENTYPE="\"80x24\""
# console scrolling support.
options WSDISPLAY_SCROLLSUPPORT
# Kernel root file system and dump configuration. # Kernel root file system and dump configuration.
config netbsd root on ? type ? config netbsd root on ? type ?
@ -648,8 +648,8 @@ makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
nsphy* at mii? phy ? # NS83840 PHYs nsphy* at mii? phy ? # NS83840 PHYs
nsphyter* at mii? phy ? # NS83843 PHYs nsphyter* at mii? phy ? # NS83843 PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
rgephy* at mii? phy ? # Realtek 8169S/8110 internal PHYs rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
rlphy* at mii? phy ? # Realtek 8139/8201L internal PHYs rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs tqphy* at mii? phy ? # TDK Semiconductor PHYs
@ -735,8 +735,7 @@ ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
upl* at uhub? port ? upl* at uhub? port ?
# Serial adapters # Serial adapters
# FTDI FT8U100AX serial adapter uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
uftdi* at uhub? port ?
ucom* at uftdi? portno ? ucom* at uftdi? portno ?
uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
@ -939,8 +938,8 @@ pseudo-device pppoe # PPP over Ethernet (RFC 2516)
pseudo-device sl # Serial Line IP pseudo-device sl # Serial Line IP
pseudo-device strip # Starmode Radio IP (Metricom) pseudo-device strip # Starmode Radio IP (Metricom)
pseudo-device irframetty # IrDA frame line discipline pseudo-device irframetty # IrDA frame line discipline
pseudo-device tun # network tunneling over tty
pseudo-device tap # virtual Ethernet pseudo-device tap # virtual Ethernet
pseudo-device tun # network tunneling over tty
pseudo-device gre # generic L3 over IP tunnel pseudo-device gre # generic L3 over IP tunnel
pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith # IPv[46] tcp relay translation i/f #pseudo-device faith # IPv[46] tcp relay translation i/f