summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-04-30 23:22:34 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-05-21 10:48:40 +0200
commitd999e4db0ac409c582cb15e6b120241ed9105064 (patch)
treee3e67ee397620804f128158780bf9a0d64936966 /drivers
parent7c055881de33b5d8ebb6d12150eaf338a0546199 (diff)
downloadblackbird-obmc-linux-d999e4db0ac409c582cb15e6b120241ed9105064.tar.gz
blackbird-obmc-linux-d999e4db0ac409c582cb15e6b120241ed9105064.zip
NFC: mei_phy depends on INTEL_MEI
INTEL_MEI_BUS_NFC never made it upstream, so make it depend on INTEL_MEI. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nfc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/Kconfig b/drivers/nfc/Kconfig
index 4775d4e61b88..74a852e4e41f 100644
--- 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
OpenPOWER on IntegriCloud