From owner-svn-src-all@freebsd.org Fri Jan 22 12:51:13 2016 Return-Path: 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 A7D52A8C539; Fri, 22 Jan 2016 12:51:13 +0000 (UTC) (envelope-from andrew@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 75E1118C1; Fri, 22 Jan 2016 12:51:13 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MCpCId063125; Fri, 22 Jan 2016 12:51:12 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MCpCcp063124; Fri, 22 Jan 2016 12:51:12 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201601221251.u0MCpCcp063124@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Fri, 22 Jan 2016 12:51:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r294561 - 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.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2016 12:51:13 -0000 Author: andrew Date: Fri Jan 22 12:51:12 2016 New Revision: 294561 URL: https://svnweb.freebsd.org/changeset/base/294561 Log: Stop defining fdt_pic_table with ARM_INTRNG, it's unused. Modified: head/sys/arm/ti/ti_common.c Modified: head/sys/arm/ti/ti_common.c ============================================================================== --- head/sys/arm/ti/ti_common.c Fri Jan 22 12:14:08 2016 (r294560) +++ head/sys/arm/ti/ti_common.c Fri Jan 22 12:51:12 2016 (r294561) @@ -53,6 +53,7 @@ struct fdt_fixup_entry fdt_fixup_table[] { NULL, NULL } }; +#ifndef ARM_INTRNG #ifdef SOC_TI_AM335X static int fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, @@ -72,7 +73,7 @@ fdt_aintc_decode_ic(phandle_t node, pcel #endif fdt_pic_decode_t fdt_pic_table[] = { -#if defined(SOC_OMAP4) && !defined(ARM_INTRNG) +#if defined(SOC_OMAP4) &gic_decode_fdt, #endif #ifdef SOC_TI_AM335X @@ -80,3 +81,4 @@ fdt_pic_decode_t fdt_pic_table[] = { #endif NULL }; +#endif /* !ARM_INTRNG */