From owner-svn-src-head@freebsd.org  Sun May 15 15:14:47 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E0E1B39E85;
 Sun, 15 May 2016 15:14:47 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 6FB081B96;
 Sun, 15 May 2016 15:14:47 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FFEkYH075900;
 Sun, 15 May 2016 15:14:46 GMT (envelope-from mmel@FreeBSD.org)
Received: (from mmel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FFEkFg075899;
 Sun, 15 May 2016 15:14:46 GMT (envelope-from mmel@FreeBSD.org)
Message-Id: <201605151514.u4FFEkFg075899@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmel set sender to
 mmel@FreeBSD.org using -f
From: Michal Meloun <mmel@FreeBSD.org>
Date: Sun, 15 May 2016 15:14:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299856 - head/sys/arm/nvidia
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 May 2016 15:14:47 -0000

Author: mmel
Date: Sun May 15 15:14:46 2016
New Revision: 299856
URL: https://svnweb.freebsd.org/changeset/base/299856

Log:
  TEGRA: Don't use common name 'iicb' for tegra specific IIC driver.
  Using commn name for different drivers breaks generic kernel creation.

Modified:
  head/sys/arm/nvidia/tegra_i2c.c

Modified: head/sys/arm/nvidia/tegra_i2c.c
==============================================================================
--- head/sys/arm/nvidia/tegra_i2c.c	Sun May 15 15:13:56 2016	(r299855)
+++ head/sys/arm/nvidia/tegra_i2c.c	Sun May 15 15:14:46 2016	(r299856)
@@ -800,5 +800,9 @@ static device_method_t tegra_i2c_methods
 DEFINE_CLASS_0(iichb, tegra_i2c_driver, tegra_i2c_methods,
     sizeof(struct tegra_i2c_softc));
 static devclass_t tegra_i2c_devclass;
-EARLY_DRIVER_MODULE(iichb, simplebus, tegra_i2c_driver, tegra_i2c_devclass, 0,
-    0, 73);
+EARLY_DRIVER_MODULE(tegra_iic, simplebus, tegra_i2c_driver, tegra_i2c_devclass,
+    0, 0, 73);
+extern devclass_t ofwiicbus_devclass;
+extern driver_t ofw_iicbus_driver;
+EARLY_DRIVER_MODULE(ofw_iicbus, tegra_iic, ofw_iicbus_driver,
+    ofwiicbus_devclass, 0, 0, BUS_PASS_BUS);