diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-30 13:34:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-30 13:34:06 -0400 |
| commit | df2cbe40753dc36af294c30209ed909869aca6cf (patch) | |
| tree | 39eb7e8e06737b295007126f4e16c1b688427163 /net/bluetooth | |
| parent | 1049f6413f6e52572a768ca1590fa479ef0a48e8 (diff) | |
| parent | 9a4ba833a2d0016cf836827e136f0c219834bd41 (diff) | |
| download | linux-3.10-df2cbe40753dc36af294c30209ed909869aca6cf.tar.gz linux-3.10-df2cbe40753dc36af294c30209ed909869aca6cf.tar.bz2 linux-3.10-df2cbe40753dc36af294c30209ed909869aca6cf.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig index f495dea741e..bfb3dc03c9d 100644 --- a/net/bluetooth/Kconfig +++ b/net/bluetooth/Kconfig @@ -6,6 +6,7 @@ menuconfig BT tristate "Bluetooth subsystem support" depends on NET && !S390 depends on RFKILL || !RFKILL + select CRYPTO help Bluetooth is low-cost, low-power, short-range wireless technology. It was designed as a replacement for cables and other short-range |