[src/netbsd-6]: src/sys/dev/pci Pull up following revision(s) (requested by p...

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

details:   https://anonhg.NetBSD.org/src/rev/521897265a41
branches:  netbsd-6
changeset: 773968:521897265a41
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Apr 03 15:38:30 2012 +0000

description:
Pull up following revision(s) (requested by pgoyette in ticket #149):
        sys/dev/pci/pcidevs: revision 1.1108
        sys/dev/pci/jmide.c: revision 1.13
Add JMB 362 (as found on ASUS M5A99X motherboard)
Add match for JMB362 (with two SATA ports).

diffstat:

 sys/dev/pci/jmide.c |  8 ++++++--
 sys/dev/pci/pcidevs |  3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r cce4849eb217 -r 521897265a41 sys/dev/pci/jmide.c
--- a/sys/dev/pci/jmide.c       Tue Apr 03 15:34:42 2012 +0000
+++ b/sys/dev/pci/jmide.c       Tue Apr 03 15:38:30 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: jmide.c,v 1.12 2012/01/30 19:41:22 drochner Exp $      */
+/*     $NetBSD: jmide.c,v 1.12.2.1 2012/04/03 15:38:31 riz Exp $       */
 
 /*
  * Copyright (c) 2007 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jmide.c,v 1.12 2012/01/30 19:41:22 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jmide.c,v 1.12.2.1 2012/04/03 15:38:31 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,6 +68,10 @@
          1,
          1
        },
+       { PCI_PRODUCT_JMICRON_JMB362,
+         0,
+         2
+       },
        { PCI_PRODUCT_JMICRON_JMB363,
          1,
          2
diff -r cce4849eb217 -r 521897265a41 sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Tue Apr 03 15:34:42 2012 +0000
+++ b/sys/dev/pci/pcidevs       Tue Apr 03 15:38:30 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1102.2.1 2012/03/22 23:00:28 riz Exp $
+$NetBSD: pcidevs,v 1.1102.2.2 2012/04/03 15:38:30 riz Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -3116,6 +3116,7 @@
 /* JMicron products */
 product JMICRON        JMB360          0x2360 JMB360 SATA Controller
 product JMICRON        JMB361          0x2361 JMB361 SATA/PATA Controller
+product JMICRON        JMB362          0x2362 JMB362 SATA Controller
 product JMICRON        JMB363          0x2363 JMB363 SATA/PATA Controller
 product JMICRON        JMB365          0x2365 JMB365 SATA/PATA Controller
 product JMICRON        JMB366          0x2366 JMB366 SATA/PATA Controller