From owner-svn-src-all@FreeBSD.ORG Fri Feb 11 19:03:00 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 97A95106564A; Fri, 11 Feb 2011 19:03:00 +0000 (UTC) (envelope-from jfv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8646A8FC08; Fri, 11 Feb 2011 19:03:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1BJ301P070974; Fri, 11 Feb 2011 19:03:00 GMT (envelope-from jfv@svn.freebsd.org) Received: (from jfv@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BJ30YQ070972; Fri, 11 Feb 2011 19:03:00 GMT (envelope-from jfv@svn.freebsd.org) Message-Id: <201102111903.p1BJ30YQ070972@svn.freebsd.org> From: Jack F Vogel Date: Fri, 11 Feb 2011 19:03:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: 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 19:03:00 -0000 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); /* * TBI_ACCEPT macro definition: