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/Kconfig | |
| parent | 93b31f48b3ba84cc5fc310c9765d11ebbeede7b5 (diff) | |
| download | linux-421d9df0628be16e55705573ab49d8ddb6a1d68c.tar.bz2 | |
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/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/cadence/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig index 739bb0048ebf..1ba3e3a67389 100644 --- a/drivers/net/ethernet/cadence/Kconfig +++ b/drivers/net/ethernet/cadence/Kconfig @@ -20,14 +20,6 @@ config NET_CADENCE if NET_CADENCE -config ARM_AT91_ETHER - tristate "AT91RM9200 Ethernet support" - depends on HAS_DMA && (ARCH_AT91 || COMPILE_TEST) - select MACB - ---help--- - If you wish to compile a kernel for the AT91RM9200 and enable - ethernet support, then you should always answer Y to this. - config MACB tristate "Cadence MACB/GEM support" depends on HAS_DMA |