aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-06-20 01:16:40 -0700
committerDavid S. Miller <davem@davemloft.net>2009-06-20 01:16:40 -0700
commitc3da63f35773b04e885c5659e560d5c521d2682e (patch)
tree5e876e7587f299cadce0b53bfaf912fb28d8283d /Documentation
parent73e42897e8e5619eacb787d2ce69be12f47cfc21 (diff)
parenta97f4424fb4cddecf9b13c9b0e3f79924b624a7f (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/rfkill.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt
index c8acd8659e9..b4860509c31 100644
--- a/Documentation/rfkill.txt
+++ b/Documentation/rfkill.txt
@@ -111,6 +111,8 @@ following attributes:
name: Name assigned by driver to this key (interface or driver name).
type: Driver type string ("wlan", "bluetooth", etc).
+ persistent: Whether the soft blocked state is initialised from
+ non-volatile storage at startup.
state: Current state of the transmitter
0: RFKILL_STATE_SOFT_BLOCKED
transmitter is turned off by software