From owner-svn-src-stable-7@FreeBSD.ORG  Sun May  6 19:01:18 2012
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D32281065674;
	Sun,  6 May 2012 19:01:18 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BE39B8FC0C;
	Sun,  6 May 2012 19:01:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q46J1I1b027102;
	Sun, 6 May 2012 19:01:18 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q46J1I4t027100;
	Sun, 6 May 2012 19:01:18 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201205061901.q46J1I4t027100@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Sun, 6 May 2012 19:01:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235100 - stable/7/sys/cam/scsi
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 May 2012 19:01:18 -0000

Author: pluknet
Date: Sun May  6 19:01:18 2012
New Revision: 235100
URL: http://svn.freebsd.org/changeset/base/235100

Log:
  Fix r234821 mis-merge.

Modified:
  stable/7/sys/cam/scsi/scsi_da.c

Modified: stable/7/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/7/sys/cam/scsi/scsi_da.c	Sun May  6 18:34:31 2012	(r235099)
+++ stable/7/sys/cam/scsi/scsi_da.c	Sun May  6 19:01:18 2012	(r235100)
@@ -554,7 +554,7 @@ static struct da_quirk_entry da_quirk_ta
 	{
 		{T_DIRECT, SIP_MEDIA_REMOVABLE, "Netac", "OnlyDisk*",
 		 "2000"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
-	}
+	},
 	{
 		/*
 		 * Olympus FE-210 camera