diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-20 04:16:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-20 04:16:40 -0400 |
| commit | c3da63f35773b04e885c5659e560d5c521d2682e (patch) | |
| tree | 5e876e7587f299cadce0b53bfaf912fb28d8283d /Documentation | |
| parent | 73e42897e8e5619eacb787d2ce69be12f47cfc21 (diff) | |
| parent | a97f4424fb4cddecf9b13c9b0e3f79924b624a7f (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.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt index c8acd8659e91..b4860509c319 100644 --- a/Documentation/rfkill.txt +++ b/Documentation/rfkill.txt | |||
| @@ -111,6 +111,8 @@ following attributes: | |||
| 111 | 111 | ||
| 112 | name: Name assigned by driver to this key (interface or driver name). | 112 | name: Name assigned by driver to this key (interface or driver name). |
| 113 | type: Driver type string ("wlan", "bluetooth", etc). | 113 | type: Driver type string ("wlan", "bluetooth", etc). |
| 114 | persistent: Whether the soft blocked state is initialised from | ||
| 115 | non-volatile storage at startup. | ||
| 114 | state: Current state of the transmitter | 116 | state: Current state of the transmitter |
| 115 | 0: RFKILL_STATE_SOFT_BLOCKED | 117 | 0: RFKILL_STATE_SOFT_BLOCKED |
| 116 | transmitter is turned off by software | 118 | transmitter is turned off by software |