From owner-svn-src-head@freebsd.org Tue May 24 15:39:58 2016 Return-Path: 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 E4784B48EA4; Tue, 24 May 2016 15:39:58 +0000 (UTC) (envelope-from adrian@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 AD746147B; Tue, 24 May 2016 15:39:58 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4OFdvI2032258; Tue, 24 May 2016 15:39:57 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4OFdvFd032257; Tue, 24 May 2016 15:39:57 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201605241539.u4OFdvFd032257@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Tue, 24 May 2016 15:39:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300616 - head/sys/dev/bhnd/soc 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 May 2016 15:39:59 -0000 Author: adrian Date: Tue May 24 15:39:57 2016 New Revision: 300616 URL: https://svnweb.freebsd.org/changeset/base/300616 Log: [bhnd] fix compilation due to incompatible types Submitted by: Michael Zhilin Differential Revision: https://reviews.freebsd.org/D6532 Modified: head/sys/dev/bhnd/soc/bhnd_soc.c Modified: head/sys/dev/bhnd/soc/bhnd_soc.c ============================================================================== --- head/sys/dev/bhnd/soc/bhnd_soc.c Tue May 24 14:34:36 2016 (r300615) +++ head/sys/dev/bhnd/soc/bhnd_soc.c Tue May 24 15:39:57 2016 (r300616) @@ -216,7 +216,7 @@ bhnd_soc_is_hw_disabled(device_t dev, de return false; } -static int +static bhnd_attach_type bhnd_soc_get_attach_type(device_t dev, device_t child) { return (BHND_ATTACH_NATIVE);