From 486c7962928848b81a0fae73b3498d45d6db15ab Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Wed, 21 Sep 2011 11:02:37 -0700
Subject: [PATCH] --- yaml --- r: 266319 b: refs/heads/master c:
 ed46fdfc54d2d4523fdd727708fe0b9e2be993cc h: refs/heads/master i:   266317:
 97b7170080fa33167d428d8d4dcdb35b3e16157f   266315:
 511751627145665ecdf091d8da40c658efe896a7   266311:
 7e79b68d44ca6f58bdc74780968f7e38298271a8   266303:
 a05e8ebef0cf7a942cb9c467a13b0014535319f4 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/nfc/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7593a20584e5..f0f367a447e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49753128d8fc976576c497c81962cf1ae57174aa
+refs/heads/master: ed46fdfc54d2d4523fdd727708fe0b9e2be993cc
diff --git a/trunk/drivers/nfc/Kconfig b/trunk/drivers/nfc/Kconfig
index 8a56fd3da989..5af959274d4e 100644
--- a/trunk/drivers/nfc/Kconfig
+++ b/trunk/drivers/nfc/Kconfig
@@ -29,7 +29,7 @@ config NFC_PN533
 
 config NFC_WILINK
 	tristate "Texas Instruments NFC WiLink driver"
-	depends on TI_ST
+	depends on TI_ST && NFC_NCI
 	help
 	  This enables the NFC driver for Texas Instrument's BT/FM/GPS/NFC
 	  combo devices. This makes use of shared transport line discipline