From owner-p4-projects@FreeBSD.ORG  Wed Sep 24 17:59:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E0FA21065695; Wed, 24 Sep 2008 17:59:58 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A458B10656A5
	for <perforce@FreeBSD.org>; Wed, 24 Sep 2008 17:59:58 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 90E5E8FC3A
	for <perforce@FreeBSD.org>; Wed, 24 Sep 2008 17:59:58 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OHxwKN057511
	for <perforce@FreeBSD.org>; Wed, 24 Sep 2008 17:59:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OHxwEa057509
	for perforce@freebsd.org; Wed, 24 Sep 2008 17:59:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 24 Sep 2008 17:59:58 GMT
Message-Id: <200809241759.m8OHxwEa057509@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 150392 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: Wed, 24 Sep 2008 17:59:59 -0000

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

Change 150392 by hselasky@hselasky_laptop001 on 2008/09/24 17:59:38

	
	Convert USS820 pccard driver into atmelarm driver, which is
	more likely the most common use-case.

Affected files ...

.. //depot/projects/usb/src/sys/conf/files#36 edit
.. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#1 add
.. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_pccard.c#8 delete
.. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#6 edit

Differences ...

==== //depot/projects/usb/src/sys/conf/files#36 (text+ko) ====

@@ -1347,8 +1347,6 @@
 dev/usb2/controller/uhci2.c		optional usb2_core usb2_controller
 dev/usb2/controller/uhci2_pci.c		optional usb2_core usb2_controller pci
 dev/usb2/controller/usb2_controller.c	optional usb2_core usb2_controller
-dev/usb2/controller/uss820dci.c		optional usb2_core usb2_controller
-dev/usb2/controller/uss820dci_pccard.c	optional usb2_core usb2_controller pccard
 #
 # USB2 storage drivers
 #

==== //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#6 (text+ko) ====

@@ -21,6 +21,7 @@
 .if defined(HAS_ATMELARM)
 SRCS+= at91dci_atmelarm.c
 SRCS+= ohci2_atmelarm.c
+SRCS+= uss820dci_atmelarm.c
 .endif
 
 SRCS+= at91dci.c
@@ -32,6 +33,5 @@
 SRCS+= uhci2.c
 SRCS+= uhci2_pci.c
 SRCS+= uss820dci.c
-SRCS+= uss820dci_pccard.c
 
 .include <bsd.kmod.mk>