From patchwork Sat Apr 19 10:52:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 4019711 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3C336BFF02 for ; Sat, 19 Apr 2014 10:53:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65F972024D for ; Sat, 19 Apr 2014 10:52:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4DB54201FD for ; Sat, 19 Apr 2014 10:52:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751187AbaDSKwv (ORCPT ); Sat, 19 Apr 2014 06:52:51 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33394 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751043AbaDSKwv (ORCPT ); Sat, 19 Apr 2014 06:52:51 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8F26DAC15; Sat, 19 Apr 2014 10:52:49 +0000 (UTC) Date: Sat, 19 Apr 2014 12:52:47 +0200 From: Jean Delvare To: linux-wireless@vger.kernel.org Cc: Lauro Ramos Venancio , Aloisio Almeida Jr , Samuel Ortiz Subject: [PATCH] NFC: nfcmrvl: Auto-select core module Message-ID: <20140419125247.40671230@endymion.delvare> Organization: SUSE Linux X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; x86_64-suse-linux-gnu) MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.5 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 As I understand it, the core nfcmrvl module is useless without the USB access module. So hide NFC_MRVL and select it automatically if NFC_MRVL_USB is selected. This avoids presenting NFC_MRVL when NFC_MRVL_USB can't be selected. Signed-off-by: Jean Delvare Cc: Lauro Ramos Venancio Cc: Aloisio Almeida Jr Cc: Samuel Ortiz --- drivers/nfc/nfcmrvl/Kconfig | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) --- linux-3.15-rc1.orig/drivers/nfc/nfcmrvl/Kconfig 2014-03-31 05:40:15.000000000 +0200 +++ linux-3.15-rc1/drivers/nfc/nfcmrvl/Kconfig 2014-04-18 21:10:14.493649773 +0200 @@ -1,18 +1,15 @@ config NFC_MRVL - tristate "Marvell NFC driver support" - depends on NFC_NCI + tristate help The core driver to support Marvell NFC devices. This driver is required if you want to support Marvell NFC device 8897. - Say Y here to compile Marvell NFC driver into the kernel or - say M to compile it as module. - config NFC_MRVL_USB - tristate "Marvell NFC-over-USB driver" - depends on NFC_MRVL && USB + tristate "Marvell Avastar 88W8897 device support (USB)" + depends on NFC_NCI && USB + select NFC_MRVL help Marvell NFC-over-USB driver.