Module Name: src
Committed By: christos
Date: Sun Aug 9 19:37:35 UTC 2009
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
add spic and drm to generic
To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 src/sys/arch/amd64/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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.246 src/sys/arch/amd64/conf/GENERIC:1.247
--- src/sys/arch/amd64/conf/GENERIC:1.246 Mon Jul 27 08:34:13 2009
+++ src/sys/arch/amd64/conf/GENERIC Sun Aug 9 15:37:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.246 2009/07/27 12:34:13 kiyohara Exp $
+# $NetBSD: GENERIC,v 1.247 2009/08/09 19:37:35 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.246 $"
+#ident "GENERIC-$Revision: 1.247 $"
maxusers 64 # estimated number of users
@@ -294,6 +294,8 @@
pckbc* at acpi? # PC keyboard controller
pcppi* at acpi? # AT-style speaker sound
sony* at acpi? # Sony Notebook Controller
+spic* at acpi? # Sony Programmable I/O Controller
+wsmouse* at spic? # mouse
thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys
ug* at acpi? # Abit uGuru Hardware monitor
wss* at acpi? # NeoMagic 256AV in wss mode
@@ -367,6 +369,16 @@
pcppi0 at isa?
sysbeep0 at pcppi?
+# DRI driver
+i915drm* at vga? # Intel i915, i945 DRM driver
+mach64drm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver
+mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver
+r128drm* at vga? # ATI Rage 128 DRM driver
+radeondrm* at vga? # ATI Radeon DRM driver
+savagedrm* at vga? # S3 Savage DRM driver
+sisdrm* at vga? # SiS DRM driver
+tdfxdrm* at vga? # 3dfx (voodoo) DRM driver
+
# Cryptographic Devices
# PCI cryptographic devices
