diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-30 04:11:37 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-30 04:11:37 (GMT) |
| commit | 1ab137bc99138dd0d459655642bee16afec8b7ce (patch) | |
| tree | f43367184618f8927f6a8a675b54c835aee5e705 /net/nfc/Kconfig | |
| parent | b807a3d688c7b1da86662b220ace548389c48167 (diff) | |
| parent | 17a2911f3395d66694fcbd2e8970015904d9b034 (diff) | |
| download | linux-fsl-qoriq-1ab137bc99138dd0d459655642bee16afec8b7ce.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
A few more stragglers intended for 3.10...
For the Bluetooth bits, Gustavo says:
"A few more patches intended for 3.10, the most important one is the support in
btusb for fw loading for the Intel Bluetooth device. Other than that we have
only fixes and clean ups."
For the iwlwifi bits, Johannes says:
"Here are a few more changes for the 3.10 stream, some bugfixes,
adjustments to some powersave parameters and a new device ID."
For the NFC bits, Samuel says:
"This pull request includes Marcel's Kconfig dependency fix on top of the LLCP
code move to net/nfc."
On top of that...Yogesh Ashok Powar provides a few PCI-related mwifiex
updates, Hauke Mehrtens provides a small ssb feature for spurious
tone avoidance on a specific chip, and Larry Finger provides a small
rtlwifi fix related to avoiding false detection of AP loss.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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" |