浏览代码

NFC: nfcmrvl: Auto-select core module

As I understand it, the core nfcmrvl module is useless without
either the USB or the UART access module. So hide NFC_MRVL and select
it automatically if either NFC_MRVL_USB or NFC_MRVL_UART is selected.

This avoids presenting NFC_MRVL when neither NFC_MRVL_USB nor
NFC_MRVL_UART can 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>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Jean Delvare 10 年之前
父节点
当前提交
893a84e818
共有 1 个文件被更改,包括 5 次插入7 次删除
  1. 5 7
      drivers/nfc/nfcmrvl/Kconfig

+ 5 - 7
drivers/nfc/nfcmrvl/Kconfig

@@ -1,18 +1,15 @@
 config NFC_MRVL
 config NFC_MRVL
-	tristate "Marvell NFC driver support"
-	depends on NFC_NCI
+	tristate
 	help
 	help
 	  The core driver to support Marvell NFC devices.
 	  The core driver to support Marvell NFC devices.
 
 
 	  This driver is required if you want to support
 	  This driver is required if you want to support
 	  Marvell NFC device 8897.
 	  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
 config NFC_MRVL_USB
 	tristate "Marvell NFC-over-USB driver"
 	tristate "Marvell NFC-over-USB driver"
-	depends on NFC_MRVL && USB
+	depends on NFC_NCI && USB
+	select NFC_MRVL
 	help
 	help
 	  Marvell NFC-over-USB driver.
 	  Marvell NFC-over-USB driver.
 
 
@@ -24,7 +21,8 @@ config NFC_MRVL_USB
 
 
 config NFC_MRVL_UART
 config NFC_MRVL_UART
 	tristate "Marvell NFC-over-UART driver"
 	tristate "Marvell NFC-over-UART driver"
-	depends on NFC_MRVL && NFC_NCI_UART
+	depends on NFC_NCI && NFC_NCI_UART
+	select NFC_MRVL
 	help
 	help
 	  Marvell NFC-over-UART driver.
 	  Marvell NFC-over-UART driver.