From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: [PATCH 3/3] net: ethernet: sfc: Make subdir logic consistent with other vendors Date: Wed, 4 Jul 2018 13:50:13 +0200 Message-ID: <20180704115013.28078-4-geert+renesas@glider.be> References: <20180704115013.28078-1-geert+renesas@glider.be> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven To: "David S . Miller" , Nicolas Ferre , Solarflare linux maintainers , Edward Cree , Bert Kenward Return-path: In-Reply-To: <20180704115013.28078-1-geert+renesas@glider.be> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Both SFC and SFC_FALCON depend on NET_VENDOR_SOLARFLARE, hence use the latter to decide whether to descend into the sfc subdirectory. Move the rule to descend into sfc/falcon to the sfc subdirectory. Signed-off-by: Geert Uytterhoeven --- drivers/net/ethernet/Makefile | 3 +-- drivers/net/ethernet/sfc/Makefile | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 0c3ab7efff8c9ddb..22555e7fa752c67e 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -80,8 +80,7 @@ obj-$(CONFIG_NET_VENDOR_SAMSUNG) += samsung/ obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/ obj-$(CONFIG_NET_VENDOR_SILAN) += silan/ obj-$(CONFIG_NET_VENDOR_SIS) += sis/ -obj-$(CONFIG_SFC) += sfc/ -obj-$(CONFIG_SFC_FALCON) += sfc/falcon/ +obj-$(CONFIG_NET_VENDOR_SOLARFLARE) += sfc/ obj-$(CONFIG_NET_VENDOR_SGI) += sgi/ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ obj-$(CONFIG_NET_VENDOR_SOCIONEXT) += socionext/ diff --git a/drivers/net/ethernet/sfc/Makefile b/drivers/net/ethernet/sfc/Makefile index 3bac58d0f88b20f8..c5c297e78d068f41 100644 --- a/drivers/net/ethernet/sfc/Makefile +++ b/drivers/net/ethernet/sfc/Makefile @@ -6,3 +6,5 @@ sfc-$(CONFIG_SFC_MTD) += mtd.o sfc-$(CONFIG_SFC_SRIOV) += sriov.o siena_sriov.o ef10_sriov.o obj-$(CONFIG_SFC) += sfc.o + +obj-$(CONFIG_SFC_FALCON) += falcon/ -- 2.17.1