From owner-svn-src-all@FreeBSD.ORG Fri Feb 11 21:28:55 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF4C3106564A; Fri, 11 Feb 2011 21:28:55 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net [IPv6:2001:7b8:2ff:146::2]) by mx1.freebsd.org (Postfix) with ESMTP id 8FD6C8FC0A; Fri, 11 Feb 2011 21:28:55 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7:0:fcb8:bd7a:f0d1:1b94] (unknown [IPv6:2001:7b8:3a7:0:fcb8:bd7a:f0d1:1b94]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 600065C59; Fri, 11 Feb 2011 22:28:53 +0100 (CET) Message-ID: <4D55AA18.3090707@FreeBSD.org> Date: Fri, 11 Feb 2011 22:28:56 +0100 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.2.15pre) Gecko/20110205 Lanikai/3.1.9pre MIME-Version: 1.0 To: Jack F Vogel References: <201102111903.p1BJ30YQ070972@svn.freebsd.org> In-Reply-To: <201102111903.p1BJ30YQ070972@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218582 - head/sys/dev/e1000 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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, 11 Feb 2011 21:28:55 -0000 On 2011-02-11 20:03, Jack F Vogel wrote: > Author: jfv > Date: Fri Feb 11 19:03:00 2011 > New Revision: 218582 > URL: http://svn.freebsd.org/changeset/base/218582 > > Log: > Revert changes made here, they will cause a conflict > later on with our shared code. > > Modified: > head/sys/dev/e1000/e1000_api.h > > Modified: head/sys/dev/e1000/e1000_api.h > ============================================================================== > --- head/sys/dev/e1000/e1000_api.h Fri Feb 11 17:18:42 2011 (r218581) > +++ head/sys/dev/e1000/e1000_api.h Fri Feb 11 19:03:00 2011 (r218582) > @@ -120,9 +120,6 @@ s32 e1000_mng_write_cmd_header(struct e > s32 e1000_mng_write_dhcp_info(struct e1000_hw * hw, > u8 *buffer, u16 length); > u32 e1000_translate_register_82542(u32 reg); > -s32 e1000_set_default_fc_generic(struct e1000_hw *hw); > -s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw); > -s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw); This breaks the build, please put back the following two prototypes for now: s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw); s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw);