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);
        }
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to