From owner-svn-src-all@FreeBSD.ORG  Fri Jul 27 17:28:12 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 14B421065670;
	Fri, 27 Jul 2012 17:28:12 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F33CC8FC19;
	Fri, 27 Jul 2012 17:28:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6RHSBmb029891;
	Fri, 27 Jul 2012 17:28:11 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6RHSBbV029889;
	Fri, 27 Jul 2012 17:28:11 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201207271728.q6RHSBbV029889@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 27 Jul 2012 17:28:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238848 - head/sys/dev/usb/controller
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jul 2012 17:28:12 -0000

Author: imp
Date: Fri Jul 27 17:28:11 2012
New Revision: 238848
URL: http://svn.freebsd.org/changeset/base/238848

Log:
  Make this compile again.  Also note that it is AT91RM9200+KB9202B
  specific still and needs some love to make it work on anything else.

Modified:
  head/sys/dev/usb/controller/at91dci_atmelarm.c

Modified: head/sys/dev/usb/controller/at91dci_atmelarm.c
==============================================================================
--- head/sys/dev/usb/controller/at91dci_atmelarm.c	Fri Jul 27 17:07:54 2012	(r238847)
+++ head/sys/dev/usb/controller/at91dci_atmelarm.c	Fri Jul 27 17:28:11 2012	(r238848)
@@ -61,12 +61,12 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/at91/at91_pmcvar.h>
 #include <arm/at91/at91rm92reg.h>
-#include <arm/at91/at91_pio_rm9200.h>
+#include <arm/at91/at91_pioreg.h>
 #include <arm/at91/at91_piovar.h>
 
 #define	MEM_RID	0
 
-/* Pin Definitions - do they belong here or somewhere else ? */
+/* Pin Definitions - do they belong here or somewhere else ? -- YES! */
 
 #define	VBUS_MASK	AT91C_PIO_PB24
 #define	VBUS_BASE	AT91RM92_PIOB_BASE