svn commit: r218582 - head/sys/dev/e1000
Doug Barton
dougb at FreeBSD.org
Fri Feb 11 23:10:40 UTC 2011
On 02/11/2011 13:28, Dimitry Andric wrote:
> 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);
I went ahead and restored these to get the build working again. I have
an em card in this system so I was able to confirm that it both builds
and runs just fine.
hth,
Doug
--
Nothin' ever doesn't change, but nothin' changes much.
-- OK Go
Breadth of IT experience, and depth of knowledge in the DNS.
Yours for the right price. :) http://SupersetSolutions.com/
More information about the svn-src-all
mailing list