From owner-svn-src-all@FreeBSD.ORG  Sun Jan 13 16:53:32 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 76354CD4;
 Sun, 13 Jan 2013 16:53:32 +0000 (UTC)
 (envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 636C1ED5;
 Sun, 13 Jan 2013 16:53:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0DGrWub019823;
 Sun, 13 Jan 2013 16:53:32 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0DGrWYb019821;
 Sun, 13 Jan 2013 16:53:32 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201301131653.r0DGrWYb019821@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 13 Jan 2013 16:53:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245379 - in head/sys/dev/terasic: de4led mtl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 13 Jan 2013 16:53:32 -0000

Author: rwatson
Date: Sun Jan 13 16:53:31 2013
New Revision: 245379
URL: http://svnweb.freebsd.org/changeset/base/245379

Log:
  Partially merge Perforce changeset 219944 to head:
  
    Consistently use the vendor name "sri-cambridge" for device
    compatibility strings on the BERI platform.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/dev/terasic/de4led/terasic_de4led_fdt.c
  head/sys/dev/terasic/mtl/terasic_mtl_fdt.c

Modified: head/sys/dev/terasic/de4led/terasic_de4led_fdt.c
==============================================================================
--- head/sys/dev/terasic/de4led/terasic_de4led_fdt.c	Sun Jan 13 16:51:57 2013	(r245378)
+++ head/sys/dev/terasic/de4led/terasic_de4led_fdt.c	Sun Jan 13 16:53:31 2013	(r245379)
@@ -62,7 +62,7 @@ static int
 terasic_de4led_fdt_probe(device_t dev)
 {
 
-	if (ofw_bus_is_compatible(dev, "cambridge,de4led")) {
+	if (ofw_bus_is_compatible(dev, "sri-cambridge,de4led")) {
 		device_set_desc(dev, "Terasic DE4 8-element LED");
 		return (BUS_PROBE_DEFAULT);
 	}

Modified: head/sys/dev/terasic/mtl/terasic_mtl_fdt.c
==============================================================================
--- head/sys/dev/terasic/mtl/terasic_mtl_fdt.c	Sun Jan 13 16:51:57 2013	(r245378)
+++ head/sys/dev/terasic/mtl/terasic_mtl_fdt.c	Sun Jan 13 16:53:31 2013	(r245379)
@@ -59,7 +59,7 @@ static int
 terasic_mtl_fdt_probe(device_t dev)
 {
 
-	if (ofw_bus_is_compatible(dev, "cambridge,mtl")) {
+	if (ofw_bus_is_compatible(dev, "sri-cambridge,mtl")) {
 		device_set_desc(dev, "Terasic Multi-touch LCD (MTL)");
 		return (BUS_PROBE_DEFAULT);
 	}