[PATCH] NFC: nfcmrvl: Auto-select core module

[PATCH] NFC: nfcmrvl: Auto-select core module

[Jean Delvare]

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 <jdelvare@suse.de>
Cc: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
Cc: Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>
---
 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.
 


-- 
Jean Delvare
SUSE L3 Support