On 31 January 2012 18:26, Greg KH [off-list ref] wrote:

On Tue, Oct 25, 2011 at 01:15:52PM +0100, Mark Einon wrote:

quoted

Manually merged changes from commits afc4b13df143, bf3f1a6081aa and 5d6bcdfe38ce into et131x.c as identified in email below.

Also removed dependency on NETDEV_1000 in Kconfig, which no longer exists.

Greg: This patch should also be good for the staging tree.

I don't think this is needed anymore, right?

Hi Greg,

Correct, this change is in staging-next and does not need to be applied.
It's since been added by a merge from Linus's tree.

Cheers,

Mark

If so, please redo it against Linus's tree and send it to me.

thanks,

greg k-h