From owner-svn-src-stable-10@FreeBSD.ORG  Mon Oct 27 07:20:40 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C11EF457;
 Mon, 27 Oct 2014 07:20:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AC77D685;
 Mon, 27 Oct 2014 07:20:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9R7Kefu012791;
 Mon, 27 Oct 2014 07:20:40 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9R7KedQ012705;
 Mon, 27 Oct 2014 07:20:40 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201410270720.s9R7KedQ012705@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 27 Oct 2014 07:20:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r273725 - in stable/10/sys/dev/ata: . chipsets
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Oct 2014 07:20:40 -0000

Author: mav
Date: Mon Oct 27 07:20:39 2014
New Revision: 273725
URL: https://svnweb.freebsd.org/changeset/base/273725

Log:
  MFC r273328: Add another PCI ID for JMB368 PATA controller.

Modified:
  stable/10/sys/dev/ata/ata-pci.h
  stable/10/sys/dev/ata/chipsets/ata-jmicron.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/ata/ata-pci.h
==============================================================================
--- stable/10/sys/dev/ata/ata-pci.h	Mon Oct 27 06:14:13 2014	(r273724)
+++ stable/10/sys/dev/ata/ata-pci.h	Mon Oct 27 07:20:39 2014	(r273725)
@@ -306,6 +306,7 @@ struct ata_pci_controller {
 #define ATA_JMB365              0x2365197b
 #define ATA_JMB366              0x2366197b
 #define ATA_JMB368              0x2368197b
+#define ATA_JMB368_2            0x0368197b
 
 #define ATA_MARVELL_ID          0x11ab
 #define ATA_M88SX5040           0x504011ab

Modified: stable/10/sys/dev/ata/chipsets/ata-jmicron.c
==============================================================================
--- stable/10/sys/dev/ata/chipsets/ata-jmicron.c	Mon Oct 27 06:14:13 2014	(r273724)
+++ stable/10/sys/dev/ata/chipsets/ata-jmicron.c	Mon Oct 27 07:20:39 2014	(r273725)
@@ -71,6 +71,7 @@ ata_jmicron_probe(device_t dev)
      { ATA_JMB365, 0, 1, 2, ATA_UDMA6, "JMB365" },
      { ATA_JMB366, 0, 2, 2, ATA_UDMA6, "JMB366" },
      { ATA_JMB368, 0, 0, 1, ATA_UDMA6, "JMB368" },
+     { ATA_JMB368_2, 0, 0, 1, ATA_UDMA6, "JMB368" },
      { 0, 0, 0, 0, 0, 0}};
     char buffer[64];