From: Rafal Ozieblo Date: Thu, 29 Jun 2017 06:13:46 +0000 (+0100) Subject: net: macb: macb.c changed to macb_main.c X-Git-Tag: v4.13-rc1~157^2~50^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b83f1527d098c04424832b0a59d75046e26bfff1;p=users%2Fjedix%2Flinux-maple.git 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 Signed-off-by: David S. Miller --- 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 similarity index 100% rename from drivers/net/ethernet/cadence/macb.c rename to drivers/net/ethernet/cadence/macb_main.c