From owner-svn-src-stable@FreeBSD.ORG  Sun Sep 20 19:26:04 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F23E0106566B;
	Sun, 20 Sep 2009 19:26:04 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E119C8FC08;
	Sun, 20 Sep 2009 19:26:04 +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 n8KJQ47h065714;
	Sun, 20 Sep 2009 19:26:04 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8KJQ4Qf065712;
	Sun, 20 Sep 2009 19:26:04 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200909201926.n8KJQ4Qf065712@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 20 Sep 2009 19:26:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197369 - stable/6/sys/dev/gem
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: Sun, 20 Sep 2009 19:26:05 -0000

Author: marius
Date: Sun Sep 20 19:26:04 2009
New Revision: 197369
URL: http://svn.freebsd.org/changeset/base/197369

Log:
  Re-apply adaption to stable/6 which somehow managed to escape r197355.

Modified:
  stable/6/sys/dev/gem/if_gem_sbus.c

Modified: stable/6/sys/dev/gem/if_gem_sbus.c
==============================================================================
--- stable/6/sys/dev/gem/if_gem_sbus.c	Sun Sep 20 19:14:34 2009	(r197368)
+++ stable/6/sys/dev/gem/if_gem_sbus.c	Sun Sep 20 19:26:04 2009	(r197369)
@@ -167,7 +167,7 @@ gem_sbus_attach(device_t dev)
 	}
 
 	if (bus_setup_intr(dev, sc->sc_res[GEM_RES_INTR], INTR_TYPE_NET |
-	    INTR_MPSAFE, NULL, gem_intr, sc, &sc->sc_ih) != 0) {
+	    INTR_MPSAFE, gem_intr, sc, &sc->sc_ih) != 0) {
 		device_printf(dev, "failed to set up interrupt\n");
 		gem_detach(sc);
 		goto fail;