git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
nfc
/
Kconfig
diff --git
a/drivers/nfc/Kconfig
b/drivers/nfc/Kconfig
index
c1fb206
..
fe20e1c
100644
(file)
--- a/
drivers/nfc/Kconfig
+++ b/
drivers/nfc/Kconfig
@@
-58,5
+58,6
@@
config NFC_PORT100
source "drivers/nfc/pn544/Kconfig"
source "drivers/nfc/microread/Kconfig"
+source "drivers/nfc/nfcmrvl/Kconfig"
endmenu