From owner-svn-src-stable-12@freebsd.org Sun Aug 11 20:47:02 2019 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 93A22C1597; Sun, 11 Aug 2019 20:47:02 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4669yG36T3z4LLR; Sun, 11 Aug 2019 20:47:02 +0000 (UTC) (envelope-from ian@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 495E71BD37; Sun, 11 Aug 2019 20:47:02 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7BKl2Cs066113; Sun, 11 Aug 2019 20:47:02 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7BKl2p8066112; Sun, 11 Aug 2019 20:47:02 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201908112047.x7BKl2p8066112@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 11 Aug 2019 20:47:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r350866 - stable/12/sys/dev/iicbus/twsi X-SVN-Group: stable-12 X-SVN-Commit-Author: ian X-SVN-Commit-Paths: stable/12/sys/dev/iicbus/twsi X-SVN-Commit-Revision: 350866 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Aug 2019 20:47:02 -0000 Author: ian Date: Sun Aug 11 20:47:01 2019 New Revision: 350866 URL: https://svnweb.freebsd.org/changeset/base/350866 Log: MFC r342102 (by gonzo): [twsi] Make extres/clk part conditional based on the EXT_RESOURCES option value This should fix kernel build for ARMADA38X and possibly some other ARM configs Modified: stable/12/sys/dev/iicbus/twsi/mv_twsi.c stable/12/sys/dev/iicbus/twsi/twsi.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/iicbus/twsi/mv_twsi.c ============================================================================== --- stable/12/sys/dev/iicbus/twsi/mv_twsi.c Sun Aug 11 20:34:24 2019 (r350865) +++ stable/12/sys/dev/iicbus/twsi/mv_twsi.c Sun Aug 11 20:47:01 2019 (r350866) @@ -61,7 +61,9 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef EXT_RESOURCES #include +#endif #include #include Modified: stable/12/sys/dev/iicbus/twsi/twsi.h ============================================================================== --- stable/12/sys/dev/iicbus/twsi/twsi.h Sun Aug 11 20:34:24 2019 (r350865) +++ stable/12/sys/dev/iicbus/twsi/twsi.h Sun Aug 11 20:47:01 2019 (r350866) @@ -34,7 +34,9 @@ #ifndef _TWSI_H_ #define _TWSI_H_ +#ifdef EXT_RESOURCES #include +#endif struct twsi_baud_rate { uint32_t raw; @@ -50,8 +52,10 @@ struct twsi_softc { device_t iicbus; void * intrhand; bool have_intr; +#ifdef EXT_RESOURCES clk_t clk_core; clk_t clk_reg; +#endif struct iic_msg *msg; uint16_t sent_bytes;