svn commit: r264904 - head/sys/mips/beri

[Brooks Davis]

Author: brooks
Date: Thu Apr 24 23:28:09 2014
New Revision: 264904
URL: http://svnweb.freebsd.org/changeset/base/264904

Log:
  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

Modified:
  head/sys/mips/beri/beri_simplebus.c

Modified: head/sys/mips/beri/beri_simplebus.c
==============================================================================
--- head/sys/mips/beri/beri_simplebus.c	Thu Apr 24 23:17:40 2014	(r264903)
+++ head/sys/mips/beri/beri_simplebus.c	Thu Apr 24 23:28:09 2014	(r264904)
@@ -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);
 }