From: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Date: Sat, 7 Mar 2015 06:23:32 +0000 (+0100)
Subject: net/macb: merge at91_ether driver into macb driver
X-Git-Tag: omap-for-v4.1/fixes-rc1~141^2~308^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=421d9df0628be16e55705573ab49d8ddb6a1d68c;p=pandora-kernel.git

net/macb: merge at91_ether driver into macb driver

macb and at91_ether drivers can be compiled as modules, but the at91_ether
driver use some functions and variables defined in the macb one, thus
creating a dependency on the macb driver.

Since these drivers are sharing the same logic we can easily merge
at91_ether into macb.

In order to factorize common probing logic we've added an ->init() function
to struct macb_config (the structure associated with the compatible
string), and moved macb specific init code from macb_probe to macb_init.

Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Tested-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed