diff options
| author |   Rafal Ozieblo <rafalo@cadence.com> | 2017-06-29 07:13:46 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-06-30 13:11:42 -0400 |
| commit | b83f1527d098c04424832b0a59d75046e26bfff1 (patch) | |
| tree | 68e81235089a6ca4fb5bb366b325b6bcfd3b11aa /drivers/net/ethernet/cadence | |
| parent | net: macb: Add tsu_clk to device tree (diff) | |
| download | linux-dev-b83f1527d098c04424832b0a59d75046e26bfff1.tar.xz linux-dev-b83f1527d098c04424832b0a59d75046e26bfff1.zip | |
net: macb: macb.c changed to macb_main.c
In case that macb is compiled as a module, macb.c has been renamed to
macb_main.c to avoid naming confusion in Makefile.
Signed-off-by: Rafal Ozieblo <rafalo@cadence.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cadence')
| -rw-r--r-- | drivers/net/ethernet/cadence/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c (renamed from drivers/net/ethernet/cadence/macb.c) | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cadence/Makefile b/drivers/net/ethernet/cadence/Makefile index 4ba75594d5c5..31ea6e34147a 100644 --- a/drivers/net/ethernet/cadence/Makefile +++ b/drivers/net/ethernet/cadence/Makefile @@ -1,6 +1,7 @@ # # Makefile for the Atmel network device drivers. # +macb-y := macb_main.o obj-$(CONFIG_MACB) += macb.o obj-$(CONFIG_MACB_PCI) += macb_pci.o diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb_main.c index 2d43a7619f58..2d43a7619f58 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb_main.c |