From owner-p4-projects@FreeBSD.ORG  Sat Oct 25 23:51:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 19C4610656A1; Sat, 25 Oct 2008 23:51:31 +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 CFBEE1065682
	for <perforce@freebsd.org>; Sat, 25 Oct 2008 23:51:30 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BDA8A8FC18
	for <perforce@freebsd.org>; Sat, 25 Oct 2008 23:51:30 +0000 (UTC)
	(envelope-from marcel@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 m9PNpUfe044781
	for <perforce@freebsd.org>; Sat, 25 Oct 2008 23:51:30 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PNpUYG044779
	for perforce@freebsd.org; Sat, 25 Oct 2008 23:51:30 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 25 Oct 2008 23:51:30 GMT
Message-Id: <200810252351.m9PNpUYG044779@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 151928 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: Sat, 25 Oct 2008 23:51:31 -0000

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

Change 151928 by marcel@marcel_xcllnt on 2008/10/25 23:50:34

	Merge fodder.

Affected files ...

.. //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#5 edit
.. //depot/projects/e500/sys/dev/cfi/cfi_core.c#4 edit
.. //depot/projects/e500/sys/dev/cfi/cfi_dev.c#4 edit
.. //depot/projects/e500/sys/dev/cfi/cfi_reg.h#4 edit
.. //depot/projects/e500/sys/dev/cfi/cfi_var.h#4 edit

Differences ...

==== //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#5 (text+ko) ====

@@ -27,6 +27,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_bus_lbc.c 184251 2008-10-25 06:18:12Z marcel $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -73,7 +76,7 @@
 	if (error)
 		return (error);
 
-	if (devtype != LBC_DEVTYPE_BFLASH)
+	if (devtype != LBC_DEVTYPE_CFI)
 		return (EINVAL);
 
 	return (cfi_probe(dev));

==== //depot/projects/e500/sys/dev/cfi/cfi_core.c#4 (text+ko) ====

@@ -27,6 +27,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_core.c 184251 2008-10-25 06:18:12Z marcel $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

==== //depot/projects/e500/sys/dev/cfi/cfi_dev.c#4 (text+ko) ====

@@ -27,6 +27,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_dev.c 184251 2008-10-25 06:18:12Z marcel $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

==== //depot/projects/e500/sys/dev/cfi/cfi_reg.h#4 (text+ko) ====

@@ -25,6 +25,8 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD: head/sys/dev/cfi/cfi_reg.h 184251 2008-10-25 06:18:12Z marcel $
  */
 
 #ifndef _DEV_CFI_REG_H_

==== //depot/projects/e500/sys/dev/cfi/cfi_var.h#4 (text+ko) ====

@@ -25,6 +25,8 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD: head/sys/dev/cfi/cfi_var.h 184251 2008-10-25 06:18:12Z marcel $
  */
 
 #ifndef _DEV_CFI_VAR_H_