Module Name: src
Committed By: snj
Date: Fri May 1 01:20:42 UTC 2009
Modified Files:
src/sys/arch/i386/conf [netbsd-5]: ALL GENERIC
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #260):
sys/arch/i386/conf/ALL: revision 1.187
sys/arch/i386/conf/GENERIC: revision 1.922
PR# port-i386/40284: add AMD Geode CS5536 audio driver; add gcscaudio(4)
to i386 GENERIC and ALL kernels
To generate a diff of this commit:
cvs rdiff -u -r1.183.4.1 -r1.183.4.2 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.915.2.3 -r1.915.2.4 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/ALL
diff -u src/sys/arch/i386/conf/ALL:1.183.4.1 src/sys/arch/i386/conf/ALL:1.183.4.2
--- src/sys/arch/i386/conf/ALL:1.183.4.1 Tue Nov 18 01:56:58 2008
+++ src/sys/arch/i386/conf/ALL Fri May 1 01:20:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.183.4.1 2008/11/18 01:56:58 snj Exp $
+# $NetBSD: ALL,v 1.183.4.2 2009/05/01 01:20:41 snj Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.183.4.1 $"
+#ident "ALL-$Revision: 1.183.4.2 $"
maxusers 32 # estimated number of users
@@ -1270,6 +1270,7 @@
esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
fms* at pci? dev ? function ? # Forte Media FM801
+gcscaudio* at pci? dev ? function ? # AMD Geode CS5536 Companion Audio
neo* at pci? dev ? function ? # NeoMagic 256 AC'97 Audio
sv* at pci? dev ? function ? # S3 SonicVibes
yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.915.2.3 src/sys/arch/i386/conf/GENERIC:1.915.2.4
--- src/sys/arch/i386/conf/GENERIC:1.915.2.3 Thu Feb 19 20:23:46 2009
+++ src/sys/arch/i386/conf/GENERIC Fri May 1 01:20:42 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.915.2.3 2009/02/19 20:23:46 snj Exp $
+# $NetBSD: GENERIC,v 1.915.2.4 2009/05/01 01:20:42 snj Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.915.2.3 $"
+#ident "GENERIC-$Revision: 1.915.2.4 $"
maxusers 64 # estimated number of users
@@ -1263,6 +1263,7 @@
esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
fms* at pci? dev ? function ? # Forte Media FM801
+gcscaudio* at pci? dev ? function ? # AMD Geode CS5536 Companion Audio
neo* at pci? dev ? function ? # NeoMagic 256 AC'97 Audio
sv* at pci? dev ? function ? # S3 SonicVibes
yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio
