From patchwork Tue Jan 3 18:57:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 89719 Delivered-To: patch@linaro.org Received: by 10.182.112.6 with SMTP id im6csp8455504obb; Tue, 3 Jan 2017 10:57:26 -0800 (PST) X-Received: by 10.99.66.198 with SMTP id p189mr117979568pga.30.1483469845965; Tue, 03 Jan 2017 10:57:25 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r82si69903958pfi.192.2017.01.03.10.57.25; Tue, 03 Jan 2017 10:57:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965675AbdACS5X (ORCPT + 5 others); Tue, 3 Jan 2017 13:57:23 -0500 Received: from mail-it0-f53.google.com ([209.85.214.53]:38744 "EHLO mail-it0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965460AbdACS5U (ORCPT ); Tue, 3 Jan 2017 13:57:20 -0500 Received: by mail-it0-f53.google.com with SMTP id x2so304478733itf.1 for ; Tue, 03 Jan 2017 10:57:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=Nf/UAmJBc3jJQvmQ2pfT6oZhCe5BDyTdcFqiLzpUqSo=; b=iAwEWnGgQHrmEkgGuS9L9wSAFYLvpMmg6mL/ygmas71YD2+XhSirH/BcVNFRd+52y8 O6JQpP5yBc+HW/1iSoRqW13ZWh0l7geHifa9w/NwM321vXgXRSC/jWBqP+UTRLwhcuy/ ezcCUR9UuokFgYV8PC6IduS9I6cHgFp6qwLyw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=Nf/UAmJBc3jJQvmQ2pfT6oZhCe5BDyTdcFqiLzpUqSo=; b=BASKZVx54+wEMLMTE7rJMVrYQuzKxjPxoZTMmwq7WQt6O6A+BzV3k3Fi6PWlXssvJF BpkV/XDW9pVzdc463Dq8tOwjLt4YnSoo0oUj2ZpIJ4fnmjuC5eJKKrvRkB8vFgCvzxNP wFMkMLV1tuhaeZ4NljmLuOhlmjh/JlHe4ETa5lIdozzncimtlZSP4+6Tj47hbphFWz9g k4Bx1a5FrtuEgcDvBvzzYYo3BEaa6vwASM7t8fz+cVVCUJ+2mtSeRdzqEjEq0KixO2HL 5bDphyNN2+QJ7QS0KJphfOb6pZh39O6j4PWC4xTDjIKEhzfa5opSmTGiFZtq4LEr6Fy8 0Ljw== X-Gm-Message-State: AIkVDXJcEotGdQTxaYEOzkbrrcQyM8xM7jTX1CWEV6+zXs5zatPBPYKak/Hb3lDZ/qlsgw+i X-Received: by 10.36.107.151 with SMTP id v145mr55506508itc.17.1483469821715; Tue, 03 Jan 2017 10:57:01 -0800 (PST) Received: from xanadu.home ([2607:fa48:6e39:d410:feaa:14ff:fea7:ed77]) by smtp.gmail.com with ESMTPSA id l73sm34174737ioe.1.2017.01.03.10.57.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2017 10:57:01 -0800 (PST) Date: Tue, 3 Jan 2017 13:57:00 -0500 (EST) From: Nicolas Pitre To: Richard Cochran , Raghu Vatsavayi , "David S. Miller" cc: netdev@vger.kernel.org Subject: [PATCH] LiquidIO VF: s/select/imply/ for PTP_1588_CLOCK In-Reply-To: <20170103101105.GA24780@localhost.localdomain> Message-ID: References: <20170103101105.GA24780@localhost.localdomain> User-Agent: Alpine 2.20 (LFD 67 2015-01-07) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix a minor fallout from the merge of the timers and the networking trees. The following error may result if the PTP_1588_CLOCK prerequisites are not available: drivers/built-in.o: In function `ptp_clock_unregister': (.text+0x40e0a5): undefined reference to `pps_unregister_source' drivers/built-in.o: In function `ptp_clock_unregister': (.text+0x40e0cc): undefined reference to `posix_clock_unregister' drivers/built-in.o: In function `ptp_clock_event': (.text+0x40e249): undefined reference to `pps_event' drivers/built-in.o: In function `ptp_clock_register': (.text+0x40e5e1): undefined reference to `pps_register_source' drivers/built-in.o: In function `ptp_clock_register': (.text+0x40e62c): undefined reference to `posix_clock_register' drivers/built-in.o: In function `ptp_clock_register': (.text+0x40e68d): undefined reference to `pps_unregister_source' Signed-off-by: Nicolas Pitre Acked-by: Richard Cochran diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig index bbc8bd16cb..dcbce6cac6 100644 --- a/drivers/net/ethernet/cavium/Kconfig +++ b/drivers/net/ethernet/cavium/Kconfig @@ -77,7 +77,7 @@ config OCTEON_MGMT_ETHERNET config LIQUIDIO_VF tristate "Cavium LiquidIO VF support" depends on 64BIT && PCI_MSI - select PTP_1588_CLOCK + imply PTP_1588_CLOCK ---help--- This driver supports Cavium LiquidIO Intelligent Server Adapter based on CN23XX chips.