Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp715456imm; Wed, 4 Jul 2018 04:51:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgped7kliVya/8+vZ1ZVBVi4SbhpWITSNR/LZ+GVP8cqFkSKIwVCs4qHmDXr34bpOL9atRY7g X-Received: by 2002:a62:3101:: with SMTP id x1-v6mr1832707pfx.246.1530705077978; Wed, 04 Jul 2018 04:51:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530705077; cv=none; d=google.com; s=arc-20160816; b=h6Y+tSQNXehz6WbaZWkzdSGEjIW1eY7re51lLAa5Ss+DBL7bQI4dNOGUo17qvzMzLx ALNkvHnPiTlOG2WA00eXCMSEhfAe0GdCbTwq7QfMN74tZaggDUvP1PSPshGI7xAT7fNL 6inzOTOZu8cG/MO9Mfy6Bi0V5X7EiC91HapjzXb+hmUrZ9szwHd3v/Z7q8CVfI+iZ8fV cA4czLJUqZcZqdcMap8vmbaWYghWX4U4nSR45jWfXuRsafQ4fvuE6LPpNTCASFjUqixH yHxeHaP7CHkGhiKE048D2TDC1zyGGag3/duzsfgCy9+afzQQgWUQIcmVF3ENiRaXWJ5I V0XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Twg6sKvLkFzp4dRKLmwYTD2c8U6U9lW4ojWN5vf3xjM=; b=Wf+7/03yepO8s0NsBYd9L6qw6FpjZ+CqBhbrlI1K8XQ3NvRAytkY6IXrubiA7KtOGh Xunshsicr/G2lbuaB+oMTId8TMgIZ65ai6Gwc1UNMQ1lb70tPHcCLBptgIuKjx70R9t2 trnLaIjeoFDi72yH8bSZTV3es0WpevgFBlW94Axp6s3W5CRPRHSjceTs6vxZJ1+yhfcE FQZQhqv+RDyNHfdzVFoIk84yYWuhRnGN+q6pZFq12IDvOzK6YZ+xukBcA8qEVDl6cZIF jCGD1KAyxXuz0B0P3kbeqCv7lEuLa1vs8rqfQjm6Rj+8Av4M8a2/x7dvF5YpnRu9VnqU ORuA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h185-v6si1159607pfc.172.2018.07.04.04.51.02; Wed, 04 Jul 2018 04:51:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934645AbeGDLuU (ORCPT + 99 others); Wed, 4 Jul 2018 07:50:20 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49478 "EHLO baptiste.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933972AbeGDLuQ (ORCPT ); Wed, 4 Jul 2018 07:50:16 -0400 Received: from ayla.of.borg ([84.194.111.163]) by baptiste.telenet-ops.be with bizsmtp id 6bqE1y00a3XaVaC01bqE98; Wed, 04 Jul 2018 13:50:14 +0200 Received: from rox.of.borg ([192.168.97.57]) by ayla.of.borg with esmtp (Exim 4.86_2) (envelope-from ) id 1fagIY-0005pt-El; Wed, 04 Jul 2018 13:50:14 +0200 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1fagIY-0007Jn-Cr; Wed, 04 Jul 2018 13:50:14 +0200 From: Geert Uytterhoeven To: "David S . Miller" , Nicolas Ferre , Solarflare linux maintainers , Edward Cree , Bert Kenward Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, 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> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180704115013.28078-1-geert+renesas@glider.be> References: <20180704115013.28078-1-geert+renesas@glider.be> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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