diff options
| author |   Cyrille Pitchen <cyrille.pitchen@atmel.com> | 2015-03-07 07:23:32 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-07 22:31:37 -0500 |
| commit | 421d9df0628be16e55705573ab49d8ddb6a1d68c (patch) | |
| tree | 4e7799984044b96d12ddbda9ae07d9412f365369 /drivers/net/ethernet/cadence/Makefile | |
| parent | net/macb: unify clock management (diff) | |
| download | linux-dev-421d9df0628be16e55705573ab49d8ddb6a1d68c.tar.xz linux-dev-421d9df0628be16e55705573ab49d8ddb6a1d68c.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/cadence/Makefile')
| -rw-r--r-- | drivers/net/ethernet/cadence/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/Makefile b/drivers/net/ethernet/cadence/Makefile index 9068b8331ed1..91f79b1f0505 100644 --- a/drivers/net/ethernet/cadence/Makefile +++ b/drivers/net/ethernet/cadence/Makefile @@ -2,5 +2,4 @@ # Makefile for the Atmel network device drivers. # -obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o obj-$(CONFIG_MACB) += macb.o |