From patchwork Tue Aug 4 16:17:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dennis Dalessandro X-Patchwork-Id: 6942621 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2C7C0C05AC for ; Tue, 4 Aug 2015 16:18:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6538A20430 for ; Tue, 4 Aug 2015 16:18:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D564203F7 for ; Tue, 4 Aug 2015 16:18:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753805AbbHDQSe (ORCPT ); Tue, 4 Aug 2015 12:18:34 -0400 Received: from mga14.intel.com ([192.55.52.115]:2675 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753342AbbHDQSc (ORCPT ); Tue, 4 Aug 2015 12:18:32 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 04 Aug 2015 09:17:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,609,1432623600"; d="scan'208";a="535892530" Received: from phlsvsds.ph.intel.com ([10.228.195.38]) by FMSMGA003.fm.intel.com with ESMTP; 04 Aug 2015 09:17:38 -0700 Received: from phlsvsds.ph.intel.com (localhost.localdomain [127.0.0.1]) by phlsvsds.ph.intel.com (8.13.8/8.13.8) with ESMTP id t74GHcT6020379; Tue, 4 Aug 2015 12:17:38 -0400 Received: (from ddalessa@localhost) by phlsvsds.ph.intel.com (8.13.8/8.13.8/Submit) id t74GHbnF020376; Tue, 4 Aug 2015 12:17:37 -0400 X-Authentication-Warning: phlsvsds.ph.intel.com: ddalessa set sender to dennis.dalessandro@intel.com using -f From: dennis.dalessandro@intel.com To: dledford@redhat.com Cc: linux-rdma@vger.kernel.org, Dennis Dalessandro Subject: [PATCH] RDMA/ipath: Do not build ipath driver without infiniband subsystem Date: Tue, 4 Aug 2015 12:17:01 -0400 Message-Id: <1438705021-20337-1-git-send-email-dennis.dalessandro@intel.com> X-Mailer: git-send-email 1.7.1 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dennis Dalessandro Moving the ipath driver to staging now requires a guard on the INFINIBAND subsytem in order to prevent the driver from being built without infiniband enabled. This will lead to a broken build. Reviewed-by: Mike Marciniszyn Signed-off-by: Dennis Dalessandro --- drivers/staging/ipath/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/ipath/Kconfig b/drivers/staging/ipath/Kconfig index 041ce06..12dcd40 100644 --- a/drivers/staging/ipath/Kconfig +++ b/drivers/staging/ipath/Kconfig @@ -1,6 +1,6 @@ config INFINIBAND_IPATH tristate "QLogic HTX HCA support" - depends on 64BIT && NET && HT_IRQ + depends on 64BIT && NET && HT_IRQ && INFINIBAND ---help--- This is a driver for the deprecated QLogic Hyper-Transport IB host channel adapter (model QHT7140),