Re: [PATCH] linux-next: et131x: Fixups due to merge issues from staging tree

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

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?

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

thanks,

greg k-h