From owner-svn-src-projects@FreeBSD.ORG  Sun Dec 21 22:08:18 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 CE0CB11D;
 Sun, 21 Dec 2014 22:08:18 +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 B9C0D3C82;
 Sun, 21 Dec 2014 22:08:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBLM8IEJ094735;
 Sun, 21 Dec 2014 22:08:18 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBLM8ITM094734;
 Sun, 21 Dec 2014 22:08:18 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201412212208.sBLM8ITM094734@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 21 Dec 2014 22:08:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r276036 - projects/arm_intrng/sys/arm/arm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Dec 2014 22:08:18 -0000

Author: andrew
Date: Sun Dec 21 22:08:17 2014
New Revision: 276036
URL: https://svnweb.freebsd.org/changeset/base/276036

Log:
  Fix a mis-merge

Modified:
  projects/arm_intrng/sys/arm/arm/gic.c

Modified: projects/arm_intrng/sys/arm/arm/gic.c
==============================================================================
--- projects/arm_intrng/sys/arm/arm/gic.c	Sun Dec 21 21:55:58 2014	(r276035)
+++ projects/arm_intrng/sys/arm/arm/gic.c	Sun Dec 21 22:08:17 2014	(r276036)
@@ -361,7 +361,6 @@ arm_gic_config(device_t dev, int irq, en
     enum intr_polarity pol)
 {
 	struct arm_gic_softc *sc = device_get_softc(dev);
-	device_t dev = sc->gic_dev;
 	uint32_t reg;
 	uint32_t mask;