svn commit: r207675 - stable/7/sbin/sysctl

[Gavin Atkinson]

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 *);