diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2018-07-04 13:50:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-05 13:05:54 +0200 |
| commit | eec8bb138e6e8214918f30eb7bdf729236d866a8 (patch) | |
| tree | 9221889c433d180b2288a50003a950a5888d52da | |
| parent | net: ethernet: Add missing VENDOR to Cadence and Packet Engines symbols (diff) | |
| download | linux-eec8bb138e6e8214918f30eb7bdf729236d866a8.tar.xz linux-eec8bb138e6e8214918f30eb7bdf729236d866a8.zip | |
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>
| -rw-r--r-- | drivers/net/ethernet/Makefile | 3 | ||||
| -rw-r--r-- | 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 0c3ab7efff8c..22555e7fa752 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 3bac58d0f88b..c5c297e78d06 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/ |