[src/netbsd-2-0]: src/sys/dev/pci Pull up revision 1.32 (requested by martti ...

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

details:   https://anonhg.NetBSD.org/src/rev/5e5f6a186dea
branches:  netbsd-2-0
changeset: 560245:5e5f6a186dea
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Apr 05 20:29:50 2004 +0000

description:
Pull up revision 1.32 (requested by martti in ticket #54):
Added another SB Live! 5.1 soundcard and joystick version

diffstat:

 sys/dev/pci/emuxki.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r c14121e8c785 -r 5e5f6a186dea sys/dev/pci/emuxki.c
--- a/sys/dev/pci/emuxki.c      Mon Apr 05 20:27:45 2004 +0000
+++ b/sys/dev/pci/emuxki.c      Mon Apr 05 20:29:50 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emuxki.c,v 1.31 2003/11/10 08:51:52 wiz Exp $  */
+/*     $NetBSD: emuxki.c,v 1.31.2.1 2004/04/05 20:29:50 tron Exp $     */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.31 2003/11/10 08:51:52 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.31.2.1 2004/04/05 20:29:50 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -367,8 +367,11 @@
        struct pci_attach_args *pa = aux;
 
        if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_CREATIVELABS &&
-           PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CREATIVELABS_SBLIVE)
+           (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CREATIVELABS_SBLIVE ||
+            PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CREATIVELABS_SBLIVE2))
+       {
                return (1);
+       }
 
        return (0);
 }