| Message ID | 20180704115013.28078-4-geert+renesas@glider.be |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: ethernet: Miscellaneous Kconfig and Makefile cleanups | expand |
On 04/07/18 12:50, Geert Uytterhoeven wrote: > 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> > --- > 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/ >
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/
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> --- drivers/net/ethernet/Makefile | 3 +-- drivers/net/ethernet/sfc/Makefile | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)