From owner-svn-src-stable@FreeBSD.ORG  Wed May  5 20:54:17 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 168421065678;
	Wed,  5 May 2010 20:54:17 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 0596F8FC25;
	Wed,  5 May 2010 20:54:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o45KsG75061198;
	Wed, 5 May 2010 20:54:16 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o45KsGbO061196;
	Wed, 5 May 2010 20:54:16 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201005052054.o45KsGbO061196@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Wed, 5 May 2010 20:54: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: r207675 - stable/7/sbin/sysctl
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 May 2010 20:54:17 -0000

Author: gavin
Date: Wed May  5 20:54:16 2010
New Revision: 207675
URL: http://svn.freebsd.org/changeset/base/207675

Log:
  Fix merge botch.
  
  Submitted by:	Sofian Brabez <sbrabez gmail.com>
  Pointy hat:	Earned and deserved.

Modified:
  stable/7/sbin/sysctl/sysctl.c

Modified: stable/7/sbin/sysctl/sysctl.c
==============================================================================
--- stable/7/sbin/sysctl/sysctl.c	Wed May  5 20:43:40 2010	(r207674)
+++ stable/7/sbin/sysctl/sysctl.c	Wed May  5 20:54:16 2010	(r207675)
@@ -58,7 +58,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 
-static int	aflag, bflag, dflag, eflag, hflag, iflag,
+static int	aflag, bflag, dflag, eflag, hflag, iflag;
 static int	Nflag, nflag, oflag, qflag, xflag;
 
 static int	oidfmt(int *, int, char *, u_int *);