Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 266319
b: refs/heads/master
c: ed46fdf
h: refs/heads/master
i:
  266317: 97b7170
  266315: 5117516
  266311: 7e79b68
  266303: a05e8eb
v: v3
  • Loading branch information
Randy Dunlap authored and John W. Linville committed Sep 21, 2011
1 parent bab5622 commit 486c796
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 49753128d8fc976576c497c81962cf1ae57174aa
refs/heads/master: ed46fdfc54d2d4523fdd727708fe0b9e2be993cc
2 changes: 1 addition & 1 deletion trunk/drivers/nfc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 486c796

Please sign in to comment.