Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/GENERIC,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.1107.2.9 retrieving revision 1.1108 diff -u -p -r1.1107.2.9 -r1.1108 --- src/sys/arch/i386/conf/GENERIC 2016/12/09 05:10:45 1.1107.2.9 +++ src/sys/arch/i386/conf/GENERIC 2014/08/16 17:56:32 1.1108 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1107.2.9 2016/12/09 05:10:45 snj Exp $ +# $NetBSD: GENERIC,v 1.1108 2014/08/16 17:56:32 apb Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1107.2.9 $" +#ident "GENERIC-$Revision: 1.1108 $" maxusers 64 # estimated number of users @@ -89,7 +89,6 @@ options SYSVSEM # System V-like semaph options SYSVSHM # System V-like memory sharing options MODULAR # new style module(7) framework -options MODULAR_DEFAULT_AUTOLOAD options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) @@ -108,7 +107,7 @@ options SYSCTL_INCLUDE_DESCR # Include options BUFQ_PRIOCSCAN # Diagnostic/debugging support options -#options DIAGNOSTIC # inexpensive kernel consistency checks +options DIAGNOSTIC # inexpensive kernel consistency checks # XXX to be commented out on release branch #options DEBUG # expensive debugging checks/support #options LOCKDEBUG # expensive locking checks/support @@ -139,6 +138,7 @@ options COMPAT_30 # NetBSD 3.0 options COMPAT_40 # NetBSD 4.0 options COMPAT_50 # NetBSD 5.0 options COMPAT_60 # NetBSD 6.0 compatibility. +options COMPAT_70 # NetBSD 7.0 compatibility. options COMPAT_43 # 4.3BSD, 386BSD, and BSDI #options COMPAT_386BSD_MBRPART # recognize old partition ID #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. @@ -147,7 +147,7 @@ options COMPAT_OSSAUDIO # OSS (Voxware) options COMPAT_SVR4 # binary compatibility with SVR4 options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux -#options COMPAT_FREEBSD # binary compatibility with FreeBSD +options COMPAT_FREEBSD # binary compatibility with FreeBSD #options COMPAT_NDIS # NDIS network driver options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. @@ -192,7 +192,6 @@ options WAPBL # File system journaling #options UFS_DIRHASH # UFS Large Directory Hashing - Experimental options NFSSERVER # Network File System server #options FFS_NO_SNAPSHOT # No FFS snapshot support -options UFS_EXTATTR # Extended attribute support for UFS1 #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. #options V7FS_EI # V7FS Endian Independent support @@ -534,15 +533,14 @@ pms* at pckbc? # PS/2 mouse for wsmous #options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads -# vga@isa and pcdisplay@isa are disabled; see PR#49290 -#vga0 at isa? +vga0 at isa? vga* at pci? dev ? function ? -#pcdisplay0 at isa? # CGA, MDA, EGA, HGA +pcdisplay0 at isa? # CGA, MDA, EGA, HGA genfb* at pci? dev ? function ? options VCONS_DRAW_INTR #machfb* at pci? dev ? function ? # ATI Mach64 framebuffer driver wsdisplay* at vga? console ? -#wsdisplay* at pcdisplay? console ? +wsdisplay* at pcdisplay? console ? wsdisplay* at wsemuldisplaydev? #wsdisplay* at machfb? console ? wskbd* at pckbd? console ? @@ -556,25 +554,16 @@ attimer0 at isa? pcppi0 at isa? sysbeep0 at pcppi? -# DRI legacy drivers -#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 -#viadrm* at drm? # VIA DRM driver - -i915drmkms* at pci? dev ? function ? -intelfb* at intelfbbus? - -radeon* at pci? dev ? function ? -radeondrmkmsfb* at radeonfbbus? - -#nouveau* at pci? dev ? function ? -#nouveaufb* at nouveaufbbus? +# 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 +viadrm* at drm? # VIA DRM driver # Serial Devices @@ -706,14 +695,6 @@ nsclpcsio* at isa? #spdmem* at iic? addr 0x55 #spdmem* at iic? addr 0x56 #spdmem* at iic? addr 0x57 -#sdtemp* at iic? addr 0x18 -#sdtemp* at iic? addr 0x19 -#sdtemp* at iic? addr 0x1a -#sdtemp* at iic? addr 0x1b -#sdtemp* at iic? addr 0x1c -#sdtemp* at iic? addr 0x1d -#sdtemp* at iic? addr 0x1e -#sdtemp* at iic? addr 0x1f # I2O devices iop* at pci? dev ? function ? # I/O processor