projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c05588
)
NFC: mei_phy depends on INTEL_MEI
author
Samuel Ortiz
<sameo@linux.intel.com>
Tue, 30 Apr 2013 21:22:34 +0000
(23:22 +0200)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Tue, 21 May 2013 08:48:40 +0000
(10:48 +0200)
INTEL_MEI_BUS_NFC never made it upstream, so make it depend on INTEL_MEI.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/Kconfig
patch
|
blob
|
history
diff --git
a/drivers/nfc/Kconfig
b/drivers/nfc/Kconfig
index
4775d4e
..
74a852e
100644
(file)
--- a/
drivers/nfc/Kconfig
+++ b/
drivers/nfc/Kconfig
@@
-28,7
+28,7
@@
config NFC_WILINK
config NFC_MEI_PHY
tristate "MEI bus NFC device support"
- depends on INTEL_MEI
_BUS_NFC
&& NFC_HCI
+ depends on INTEL_MEI && NFC_HCI
help
This adds support to use an mei bus nfc device. Select this if you
will use an HCI NFC driver for an NFC chip connected behind an