Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> :
[...]
> diff --cc drivers/net/r8169.c
> index 40bcb82,6f36306..0000000
> --- a/drivers/net/r8169.c
> +++ b/drivers/net/r8169.c
> @@@ -682,19 -666,8 +682,19 @@@ struct rtl8169_private
> struct rtl8169_counters counters;
> u32 saved_wolopts;
>
> - const struct firmware *fw;
> + struct rtl_fw {
> + const struct firmware *fw;
> +
> +#define RTL_VER_SIZE 32
> +
> + char version[RTL_VER_SIZE];
> +
> + struct rtl_fw_phy_action {
> + __le32 *code;
> + size_t size;
> + } phy_action;
> + } *rtl_fw;
> - #define RTL_FIRMWARE_UNKNOWN ERR_PTR(-EAGAIN);
> + #define RTL_FIRMWARE_UNKNOWN ERR_PTR(-EAGAIN)
There should not be further conflict in this part of the code until
things get merged with Linus's tree. Do what suits best.
Thanks.
--
Ueimor
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
