From owner-svn-src-all@FreeBSD.ORG  Thu Apr 24 23:28:10 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0CEC516F;
 Thu, 24 Apr 2014 23:28:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EE0CF1D37;
 Thu, 24 Apr 2014 23:28:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ONS9XR096856;
 Thu, 24 Apr 2014 23:28:09 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ONS9ii096855;
 Thu, 24 Apr 2014 23:28:09 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201404242328.s3ONS9ii096855@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 24 Apr 2014 23:28:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264904 - head/sys/mips/beri
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.17
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: Thu, 24 Apr 2014 23:28:10 -0000

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);
 }