From owner-svn-src-all@freebsd.org  Tue Nov 15 19:09:37 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 CAD6FC435AC;
 Tue, 15 Nov 2016 19:09:37 +0000 (UTC)
 (envelope-from loos@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 9CC502DE;
 Tue, 15 Nov 2016 19:09:37 +0000 (UTC)
 (envelope-from loos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAFJ9acV009552;
 Tue, 15 Nov 2016 19:09:36 GMT (envelope-from loos@FreeBSD.org)
Received: (from loos@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAFJ9aVK009551;
 Tue, 15 Nov 2016 19:09:36 GMT (envelope-from loos@FreeBSD.org)
Message-Id: <201611151909.uAFJ9aVK009551@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: loos set sender to
 loos@FreeBSD.org using -f
From: Luiz Otavio O Souza <loos@FreeBSD.org>
Date: Tue, 15 Nov 2016 19:09:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308693 - head/sys/arm/ti
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.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Nov 2016 19:09:37 -0000

Author: loos
Date: Tue Nov 15 19:09:36 2016
New Revision: 308693
URL: https://svnweb.freebsd.org/changeset/base/308693

Log:
  Change the TI aintc driver name to "ti_aintc" to avoid the conflict with
  the aintc driver for Allwinner A10.
  
  This fixes the boot of the GENERIC ARM kernel on TI/AM335x SoCs.
  
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  head/sys/arm/ti/aintc.c

Modified: head/sys/arm/ti/aintc.c
==============================================================================
--- head/sys/arm/ti/aintc.c	Tue Nov 15 18:57:25 2016	(r308692)
+++ head/sys/arm/ti/aintc.c	Tue Nov 15 19:09:36 2016	(r308693)
@@ -297,13 +297,13 @@ static device_method_t ti_aintc_methods[
 };
 
 static driver_t ti_aintc_driver = {
-	"aintc",
+	"ti_aintc",
 	ti_aintc_methods,
 	sizeof(struct ti_aintc_softc),
 };
 
 static devclass_t ti_aintc_devclass;
 
-EARLY_DRIVER_MODULE(aintc, simplebus, ti_aintc_driver, ti_aintc_devclass,
+EARLY_DRIVER_MODULE(ti_aintc, simplebus, ti_aintc_driver, ti_aintc_devclass,
     0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
 SIMPLEBUS_PNP_INFO(compat_data);