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

Back out all changes for rev 1.346 which are not related to PR/45850

Browse Source 
Should fix the reported build problem from Paul Goyette
This commit is contained in:
veego 2012-01-17 18:11:28 +00:00
parent 32dd90c25f
commit afbd7949a7
1 changed files with 35 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
sys/arch/amd64/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.346 2012/01/17 03:49:19 christos Exp $
# $NetBSD: GENERIC,v 1.347 2012/01/17 18:11:28 veego Exp $
#
# GENERIC machine description file
#
@ -22,15 +22,10 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.346 $"
#ident "GENERIC-$Revision: 1.347 $"
maxusers 64 # estimated number of users
# Common binary formats are statically compiled in by default.
options EXEC_ELF32 # exec ELF 32-bits binaries
#no options EXEC_ELF64 # exec ELF 64-bits binaries
#no options EXEC_SCRIPT # exec #! scripts
# delay between "rebooting ..." message and hardware reset, in milliseconds
#options CPURESET_DELAY=2000
@ -72,8 +67,6 @@ options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
#no options EXEC_ELF64 # exec ELF 64-bits binaries
#no options EXEC_SCRIPT # exec #! scripts
options MODULAR # new style module(7) framework
options USERCONF # userconf(4) support
@ -124,10 +117,11 @@ options COMPAT_50 # NetBSD 5.0 compatibility,
options COMPAT_43 # and 4.3BSD
#options COMPAT_386BSD_MBRPART # recognize old partition ID
#options COMPAT_OSSAUDIO
options COMPAT_OSSAUDIO
options COMPAT_NETBSD32
#options COMPAT_LINUX
#options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
options COMPAT_LINUX
options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
options EXEC_ELF32
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
@ -141,23 +135,22 @@ file-system FFS # UFS
file-system MFS # memory file system
file-system NFS # Network File System client
file-system TMPFS # Efficient memory file-system
# File systems, built as module(7)s by default
#file-system EXT2FS # second extended file system (linux)
#file-system LFS # log-structured file system
#file-system NTFS # Windows/NT file system (experimental)
#file-system CD9660 # ISO 9660 + Rock Ridge file system
#file-system MSDOSFS # MS-DOS file system
#file-system FDESC # /dev/fd
#file-system KERNFS # /kern
#file-system NULLFS # loopback file system
#file-system OVERLAY # overlay file system
#file-system PROCFS # /proc
#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
#file-system SMBFS # experimental - CIFS; also needs nsmb (below)
#file-system UMAPFS # NULLFS + uid and gid remapping
#file-system UNION # union file system
#file-system CODA # Coda File System; also needs vcoda (below)
#file-system PTYFS # /dev/ptm support
file-system EXT2FS # second extended file system (linux)
file-system LFS # log-structured file system
file-system NTFS # Windows/NT file system (experimental)
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
file-system KERNFS # /kern
file-system NULLFS # loopback file system
file-system OVERLAY # overlay file system
file-system PROCFS # /proc
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
file-system SMBFS # experimental - CIFS; also needs nsmb (below)
file-system UMAPFS # NULLFS + uid and gid remapping
file-system UNION # union file system
file-system CODA # Coda File System; also needs vcoda (below)
file-system PTYFS # /dev/ptm support
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
#file-system HFS # experimental - Apple HFS+ (read-only)
#file-system NILFS # experimental - NTT's NiLFS(2)
@ -389,19 +382,15 @@ attimer0 at isa?
pcppi0 at isa?
sysbeep0 at pcppi?
# Legacy DRI driver
#i915drm* at drm? # Intel i915, i945 DRM driver
#mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
#mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
#r128drm* at drm? # ATI Rage 128 DRM driver
#radeondrm* at drm? # ATI Radeon DRM driver
#savagedrm* at drm? # S3 Savage DRM driver
#sisdrm* at drm? # SiS DRM driver
#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
# New DRM/GEM driver ported from OpenBSD (Intel only)
inteldrm* at drm?
drmdev* at inteldrm?
# DRI driver
i915drm* at drm? # Intel i915, i945 DRM driver
mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
r128drm* at drm? # ATI Rage 128 DRM driver
radeondrm* at drm? # ATI Radeon DRM driver
savagedrm* at drm? # S3 Savage DRM driver
sisdrm* at drm? # SiS DRM driver
tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
# Cryptographic Devices
@ -1203,9 +1192,9 @@ pseudo-device bridge # simple inter-network bridging
pseudo-device agr # IEEE 802.3ad link aggregation
#
# accept filters, built as module(7)s by default
#pseudo-device accf_data # "dataready" accept filter
#pseudo-device accf_http # "httpready" accept filter
# accept filters
pseudo-device accf_data # "dataready" accept filter
pseudo-device accf_http # "httpready" accept filter
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
@ -1221,7 +1210,7 @@ pseudo-device bcsp # BlueCore Serial Protocol
pseudo-device btuart # Bluetooth HCI UART (H4)
# a pseudo device needed for Coda # also needs CODA (above)
#pseudo-device vcoda 4 # coda minicache <-> venus comm.
pseudo-device vcoda 4 # coda minicache <-> venus comm.
# a pseudo device needed for SMBFS
pseudo-device nsmb # experimental - SMB requester