From b83f1527d098c04424832b0a59d75046e26bfff1 Mon Sep 17 00:00:00 2001 From: Rafal Ozieblo Date: Thu, 29 Jun 2017 07:13:46 +0100 Subject: [PATCH] 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 --- drivers/net/ethernet/cadence/Makefile | 1 + drivers/net/ethernet/cadence/{macb.c => macb_main.c} | 0 2 files changed, 1 insertion(+) rename drivers/net/ethernet/cadence/{macb.c => macb_main.c} (100%) 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 -- 2.11.0