diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-29 19:31:57 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-29 19:31:57 (GMT) |
| commit | 17a2911f3395d66694fcbd2e8970015904d9b034 (patch) | |
| tree | c93e40197d4614b5183f86f0335c5c7abcee31aa /net/nfc/Kconfig | |
| parent | 94dace10142790ddeb0a3a7b8b33d9540d30c79f (diff) | |
| parent | a8a48e60a468084ef6ec23c78e8903c9e0ba7a4c (diff) | |
| download | linux-fsl-qoriq-17a2911f3395d66694fcbd2e8970015904d9b034.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/nfc/Kconfig')
| -rw-r--r-- | net/nfc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/Kconfig b/net/nfc/Kconfig index 60c3bbb..5948b2f 100644 --- a/net/nfc/Kconfig +++ b/net/nfc/Kconfig @@ -4,6 +4,7 @@ menuconfig NFC depends on NET + depends on RFKILL || !RFKILL tristate "NFC subsystem support" default n help @@ -15,6 +16,5 @@ menuconfig NFC source "net/nfc/nci/Kconfig" source "net/nfc/hci/Kconfig" -source "net/nfc/llcp/Kconfig" source "drivers/nfc/Kconfig" |