From owner-p4-projects@FreeBSD.ORG  Wed Dec 10 17:38:34 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1445110656D8; Wed, 10 Dec 2008 17:38:34 +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 CBA6910656D3
	for <perforce@freebsd.org>; Wed, 10 Dec 2008 17:38:33 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BD1F48FC1E
	for <perforce@freebsd.org>; Wed, 10 Dec 2008 17:38:33 +0000 (UTC)
	(envelope-from sam@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 mBAHcXEo064341
	for <perforce@freebsd.org>; Wed, 10 Dec 2008 17:38:33 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAHcX0q064339
	for perforce@freebsd.org; Wed, 10 Dec 2008 17:38:33 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 10 Dec 2008 17:38:33 GMT
Message-Id: <200812101738.mBAHcX0q064339@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154445 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, 10 Dec 2008 17:38:34 -0000

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

Change 154445 by sam@sam_ebb on 2008/12/10 17:37:43

	the device id tag for ixp435 is the same for ixp465 so show both
	when describing the fw image to avoid confusion

Affected files ...

.. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_npe.c#9 edit

Differences ...

==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_npe.c#9 (text+ko) ====

@@ -446,7 +446,7 @@
 ixpnpe_init(struct ixpnpe_softc *sc, const char *imageName, uint32_t imageId)
 {
 	static const char *devname[4] =
-	     { "IXP425", "IXP465", "DeviceID#2", "DeviceID#3" };
+	     { "IXP425", "IXP435/IXP465", "DeviceID#2", "DeviceID#3" };
 	uint32_t imageSize;
 	const uint32_t *imageCodePtr;
 	const struct firmware *fw;