From owner-svn-src-all@FreeBSD.ORG  Sun Mar  1 07:02:16 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F11D31065670;
	Sun,  1 Mar 2009 07:02:16 +0000 (UTC)
	(envelope-from scottl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D6B0D8FC12;
	Sun,  1 Mar 2009 07:02:16 +0000 (UTC)
	(envelope-from scottl@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2172GBZ034090;
	Sun, 1 Mar 2009 07:02:16 GMT (envelope-from scottl@svn.freebsd.org)
Received: (from scottl@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2172G2n034089;
	Sun, 1 Mar 2009 07:02:16 GMT (envelope-from scottl@svn.freebsd.org)
Message-Id: <200903010702.n2172G2n034089@svn.freebsd.org>
From: Scott Long <scottl@FreeBSD.org>
Date: Sun, 1 Mar 2009 07:02:16 +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: r189213 - in stable/7/sys: . cam contrib/pf
	dev/ath/ath_hal dev/cxgb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Mar 2009 07:02:17 -0000

Author: scottl
Date: Sun Mar  1 07:02:16 2009
New Revision: 189213
URL: http://svn.freebsd.org/changeset/base/189213

Log:
  Merge 188688: GCC bogon.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/cam/cam_xpt.c   (contents, props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/cam/cam_xpt.c
==============================================================================
--- stable/7/sys/cam/cam_xpt.c	Sun Mar  1 07:00:52 2009	(r189212)
+++ stable/7/sys/cam/cam_xpt.c	Sun Mar  1 07:02:16 2009	(r189213)
@@ -5439,7 +5439,8 @@ static char *probe_action_text[] = {
 
 #define PROBE_SET_ACTION(softc, newaction)	\
 do {									\
-	char **text = probe_action_text;				\
+	char **text;							\
+	text = probe_action_text;					\
 	CAM_DEBUG((softc)->periph->path, CAM_DEBUG_INFO,		\
 	    ("Probe %s to %s\n", text[(softc)->action],			\
 	    text[(newaction)]));					\