[src/netbsd-1-5]: src/sys/arch/i386/conf Apply patch (requested by sommerfeld):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eb32995285c9
branches:  netbsd-1-5
changeset: 491638:eb32995285c9
user:      he <he%NetBSD.org@localhost>
date:      Sun May 06 14:44:49 2001 +0000

description:
Apply patch (requested by sommerfeld):
  Add a driver for the NeoMagic 256 AC'97 chip.

diffstat:

 sys/arch/i386/conf/CARDBUS        |  4 +++-
 sys/arch/i386/conf/GENERIC        |  6 ++++--
 sys/arch/i386/conf/GENERIC_LAPTOP |  6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diffs (91 lines):

diff -r a9d00d4e5704 -r eb32995285c9 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS        Sun May 06 14:42:02 2001 +0000
+++ b/sys/arch/i386/conf/CARDBUS        Sun May 06 14:44:49 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CARDBUS,v 1.14.2.8 2001/05/06 14:32:52 he Exp $
+#      $NetBSD: CARDBUS,v 1.14.2.9 2001/05/06 14:44:49 he Exp $
 #
 #      CARDBUS -- GENERIC + CardBus support
 #      from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
@@ -701,6 +701,7 @@
 eap*   at pci? dev ? function ?        # Ensoniq AudioPCI
 eso*   at pci? dev ? function ?        # ESS Solo-1 PCI AudioDrive
 fms*   at pci? dev ? function ?        # Forte Media FM801
+neo*   at pci? dev ? function ?        # NeoMagic 256 AC'97 Audio
 sv*    at pci? dev ? function ?        # S3 SonicVibes
 
 # ISA Plug-and-Play audio devices
@@ -744,6 +745,7 @@
 audio* at fms?
 audio* at gus?
 audio* at guspnp?
+audio* at neo?
 audio* at pas?
 audio* at sb?
 audio* at sp?
diff -r a9d00d4e5704 -r eb32995285c9 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun May 06 14:42:02 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun May 06 14:44:49 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.354.2.13 2001/05/03 20:58:33 he Exp $
+#      $NetBSD: GENERIC,v 1.354.2.14 2001/05/06 14:44:50 he Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.354.2.13 $"
+#ident                 "GENERIC-$Revision: 1.354.2.14 $"
 
 maxusers       32              # estimated number of users
 
@@ -695,6 +695,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
+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
 
@@ -741,6 +742,7 @@
 audio* at fms?
 audio* at gus?
 audio* at guspnp?
+audio* at neo?
 audio* at pas?
 audio* at sb?
 audio* at sp?
diff -r a9d00d4e5704 -r eb32995285c9 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Sun May 06 14:42:02 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Sun May 06 14:44:49 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC_LAPTOP,v 1.2.2.8 2001/05/03 20:59:01 he Exp $
+#      $NetBSD: GENERIC_LAPTOP,v 1.2.2.9 2001/05/06 14:44:50 he Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.2.2.8 $"
+#ident                 "GENERIC-$Revision: 1.2.2.9 $"
 
 maxusers       32              # estimated number of users
 
@@ -568,6 +568,7 @@
 eap*   at pci? dev ? function ?        # Ensoniq AudioPCI
 esm*   at pci? dev ? function ?        # ESS Maestro-1/2/2e PCI Audio Accelerator
 eso*   at pci? dev ? function ?        # ESS Solo-1 PCI AudioDrive
+neo*   at pci? dev ? function ?        # 
 fms*   at pci? dev ? function ?        # Forte Media FM801
 sv*    at pci? dev ? function ?        # S3 SonicVibes
 yds*   at pci? dev ? function ?        # Yamaha DS-1 PCI Audio
@@ -615,6 +616,7 @@
 audio* at fms?
 audio* at gus?
 audio* at guspnp?
+audio* at neo?
 audio* at pas?
 audio* at sb?
 audio* at sp?