From owner-p4-projects@FreeBSD.ORG  Tue Apr  4 17:33:33 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8139D16A480; Tue,  4 Apr 2006 17:33:33 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 613B016A454
	for <perforce@freebsd.org>; Tue,  4 Apr 2006 17:33:33 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6A38143D46
	for <perforce@freebsd.org>; Tue,  4 Apr 2006 17:33:32 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k34HXWXT078891
	for <perforce@freebsd.org>; Tue, 4 Apr 2006 17:33:32 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34HXWdJ078888
	for perforce@freebsd.org; Tue, 4 Apr 2006 17:33:32 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 4 Apr 2006 17:33:32 GMT
Message-Id: <200604041733.k34HXWdJ078888@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94615 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Apr 2006 17:33:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=94615

Change 94615 by imp@imp_Speedy on 2006/04/04 17:32:43

	Aarrggghhh.  compile nits.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#12 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#12 (text+ko) ====

@@ -40,7 +40,6 @@
 
 #include <arm/at91/at91rm92reg.h>
 #include <arm/at91/at91_twireg.h>
-#include <arm/at91/at91_twiio.h>
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
@@ -153,8 +152,10 @@
 static int
 at91_twi_detach(device_t dev)
 {
+	struct at91_twi_softc *sc;
 	int rv;
 
+	sc = device_get_softc(dev);
 	at91_twi_deactivate(dev);
 	if (sc->iicbus && (rv = device_delete_child(dev, sc->iicbus)) != 0)
 		return (rv);