From owner-p4-projects@FreeBSD.ORG  Fri Mar  6 19:14:22 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A3CE71065673; Fri,  6 Mar 2009 19:14:21 +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 5FBFD1065670
	for <perforce@FreeBSD.org>; Fri,  6 Mar 2009 19:14:21 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D3BB8FC24
	for <perforce@FreeBSD.org>; Fri,  6 Mar 2009 19:14:21 +0000 (UTC)
	(envelope-from lulf@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 n26JELQm058267
	for <perforce@FreeBSD.org>; Fri, 6 Mar 2009 19:14:21 GMT
	(envelope-from lulf@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n26JELj1058265
	for perforce@freebsd.org; Fri, 6 Mar 2009 19:14:21 GMT
	(envelope-from lulf@FreeBSD.org)
Date: Fri, 6 Mar 2009 19:14:21 GMT
Message-Id: <200903061914.n26JELj1058265@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lulf@FreeBSD.org using -f
From: Ulf Lilleengen <lulf@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 158798 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: Fri, 06 Mar 2009 19:14:23 -0000

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

Change 158798 by lulf@lulf_carrot on 2009/03/06 19:13:55

	- Rename from at32_mci to atmel_mci to make it common for at91 and
	  avr32.

Affected files ...

.. //depot/projects/avr32/src/sys/avr32/avr32/at32_mci.c#2 delete
.. //depot/projects/avr32/src/sys/avr32/conf/NGW100#12 edit
.. //depot/projects/avr32/src/sys/conf/files.avr32#11 edit
.. //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#1 add
.. //depot/projects/avr32/src/sys/dev/mmc/mmc.c#4 edit

Differences ...

==== //depot/projects/avr32/src/sys/avr32/conf/NGW100#12 (text+ko) ====

@@ -54,7 +54,7 @@
 device		uart			# USART support
 #device		atmel_twi		# TWI (I2C) support
 #device		atmel_ssc		# Sync Serial controller
-device		at32_mci		# Media card interface
+device		atmel_mci		# Media card interface
 
 # Drivers for onboard parallel flash
 device		cfi

==== //depot/projects/avr32/src/sys/conf/files.avr32#11 (text+ko) ====

@@ -35,7 +35,7 @@
 avr32/avr32/at32_pio.c		optional	at32_pio
 avr32/avr32/at32_sdramc.c	optional	at32_sdramc
 avr32/avr32/at32_smc.c		optional	at32_smc
-avr32/avr32/at32_mci.c		optional	at32_mci
+dev/mmc/atmel_mci.c		optional	atmel_mci
 avr32/avr32/busdma_machdep.c	optional	at32_mci
 dev/cfi/cfi_bus_at32_smc.c	optional	at32_smc cfi
 

==== //depot/projects/avr32/src/sys/dev/mmc/mmc.c#4 (text+ko) ====

@@ -1528,6 +1528,5 @@
 static devclass_t mmc_devclass;
 
 
-DRIVER_MODULE(mmc, at32_mci, mmc_driver, mmc_devclass, NULL, NULL);
-DRIVER_MODULE(mmc, at91_mci, mmc_driver, mmc_devclass, NULL, NULL);
+DRIVER_MODULE(mmc, atmel_mci, mmc_driver, mmc_devclass, NULL, NULL);
 DRIVER_MODULE(mmc, sdhci, mmc_driver, mmc_devclass, NULL, NULL);