Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eec8bb13 authored Jul 04, 2018 by Geert Uytterhoeven Committed by David S. Miller Jul 05, 2018

net: ethernet: sfc: Make subdir logic consistent with other vendors



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 <geert+renesas@glider.be>
Acked-by: Martin Habets <mhabets@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0df5f81c

drivers/net/ethernet/Makefile

+1 −2

Original line number	Diff line number	Diff line
		@@ -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/

drivers/net/ethernet/sfc/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -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/