summaryrefslogtreecommitdiffstats
path: root/sys/mips
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2014-04-24 23:28:09 +0000
committerbrooks <brooks@FreeBSD.org>2014-04-24 23:28:09 +0000
commit520525b9030603bd0c155c88b72b14989c525a78 (patch)
treeb7121eccdf86a5031af416e1a7f09573b28e324a /sys/mips
parent61fbb1ba9fa08215a056eac6eca53f76606d007b (diff)
downloadFreeBSD-src-520525b9030603bd0c155c88b72b14989c525a78.zip
FreeBSD-src-520525b9030603bd0c155c88b72b14989c525a78.tar.gz
Fix beri_simplebus probing. It's not allowed to have two modules on the
same bus with the same name. Tweak the description so it's clear the BERI version attached. Sponsored by: DARPA, AFRL
Diffstat (limited to 'sys/mips')
-rw-r--r--sys/mips/beri/beri_simplebus.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/mips/beri/beri_simplebus.c b/sys/mips/beri/beri_simplebus.c
index 934a395..ee720d5 100644
--- a/sys/mips/beri/beri_simplebus.c
+++ b/sys/mips/beri/beri_simplebus.c
@@ -136,9 +136,10 @@ static driver_t simplebus_driver = {
devclass_t simplebus_devclass;
-DRIVER_MODULE(simplebus, ofwbus, simplebus_driver, simplebus_devclass, 0, 0);
-DRIVER_MODULE(simplebus, simplebus, simplebus_driver, simplebus_devclass, 0,
+DRIVER_MODULE(beri_simplebus, ofwbus, simplebus_driver, simplebus_devclass, 0,
0);
+DRIVER_MODULE(beri_simplebus, simplebus, simplebus_driver, simplebus_devclass,
+ 0, 0);
static int
simplebus_probe(device_t dev)
@@ -150,7 +151,7 @@ simplebus_probe(device_t dev)
if (!ofw_bus_is_compatible(dev, "simple-bus"))
return (ENXIO);
- device_set_desc(dev, "Flattened device tree simple bus");
+ device_set_desc(dev, "Flattened device tree simple bus (BERI version)");
return (BUS_PROBE_SPECIFIC);
}
OpenPOWER on IntegriCloud