From d4d853b37bcd2c8c7506b0a6e69457e99855f244 Mon Sep 17 00:00:00 2001 From: rwatson Date: Sun, 13 Jan 2013 16:53:31 +0000 Subject: [PATCH] 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 --- sys/dev/terasic/de4led/terasic_de4led_fdt.c | 2 +- sys/dev/terasic/mtl/terasic_mtl_fdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/terasic/de4led/terasic_de4led_fdt.c b/sys/dev/terasic/de4led/terasic_de4led_fdt.c index 9c0782640443..d3c50b1887f1 100644 --- a/sys/dev/terasic/de4led/terasic_de4led_fdt.c +++ b/sys/dev/terasic/de4led/terasic_de4led_fdt.c @@ -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); } diff --git a/sys/dev/terasic/mtl/terasic_mtl_fdt.c b/sys/dev/terasic/mtl/terasic_mtl_fdt.c index 3dd5151146ce..82fa7202360c 100644 --- a/sys/dev/terasic/mtl/terasic_mtl_fdt.c +++ b/sys/dev/terasic/mtl/terasic_mtl_fdt.c @@ -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); }