diff options
author | David S. Miller <davem@davemloft.net> | 2010-03-03 22:42:54 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-03 22:42:54 -0800 |
commit | e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3 (patch) | |
tree | 5ed22d681be9cc6a3677d61b0a19fcea5702d98c /include/linux | |
parent | 1cd4efddc4512ccbd9fe317f688f361605ca0c88 (diff) | |
parent | 31f66be44a657a14e0ab3536e4877c66c9ce031e (diff) | |
download | blackbird-op-linux-e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3.tar.gz blackbird-op-linux-e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/rfkill.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h index 97059d08a626..4f82326eb294 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h @@ -29,7 +29,7 @@ /** * enum rfkill_type - type of rfkill switch. * - * @RFKILL_TYPE_ALL: toggles all switches (userspace only) + * @RFKILL_TYPE_ALL: toggles all switches (requests only - not a switch type) * @RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device. * @RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device. * @RFKILL_TYPE_UWB: switch is on a ultra wideband device. |