Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Geert Uytterhoeven and committed by
David S. Miller
eec8bb13 0df5f81c

+3 -2
+1 -2
drivers/net/ethernet/Makefile
··· 80 80 obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/ 81 81 obj-$(CONFIG_NET_VENDOR_SILAN) += silan/ 82 82 obj-$(CONFIG_NET_VENDOR_SIS) += sis/ 83 - obj-$(CONFIG_SFC) += sfc/ 84 - obj-$(CONFIG_SFC_FALCON) += sfc/falcon/ 83 + obj-$(CONFIG_NET_VENDOR_SOLARFLARE) += sfc/ 85 84 obj-$(CONFIG_NET_VENDOR_SGI) += sgi/ 86 85 obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ 87 86 obj-$(CONFIG_NET_VENDOR_SOCIONEXT) += socionext/
+2
drivers/net/ethernet/sfc/Makefile
··· 6 6 sfc-$(CONFIG_SFC_SRIOV) += sriov.o siena_sriov.o ef10_sriov.o 7 7 8 8 obj-$(CONFIG_SFC) += sfc.o 9 + 10 + obj-$(CONFIG_SFC_FALCON) += falcon/