From 7f61a04434af6d7a9d1c4a91c60f08019165d310 Mon Sep 17 00:00:00 2001
From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Date: Mon, 23 Jun 2008 17:22:56 -0300
Subject: [PATCH] --- yaml --- r: 103137 b: refs/heads/master c:
 f3146aff7f283c8699e0c97df6307a705786eeba h: refs/heads/master i:   103135:
 b90ac659b9afb5225dadc4e0c6eca78b63b5f1f0 v: v3

---
 [refs]                         | 2 +-
 trunk/Documentation/rfkill.txt | 7 +++++++
 trunk/include/linux/rfkill.h   | 6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7cd0f8a40146..40bb648dd175 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1839cea91e5629756dd4f87c5d70d8a18b89c0b4
+refs/heads/master: f3146aff7f283c8699e0c97df6307a705786eeba
diff --git a/trunk/Documentation/rfkill.txt b/trunk/Documentation/rfkill.txt
index a83ff23cd68c..ec75d6d34785 100644
--- a/trunk/Documentation/rfkill.txt
+++ b/trunk/Documentation/rfkill.txt
@@ -8,6 +8,13 @@ rfkill - RF switch subsystem support
 ===============================================================================
 1: Implementation details
 
+The rfkill switch subsystem exists to add a generic interface to circuitry that
+can enable or disable the RF output of a radio *transmitter* of any type.
+
+When a rfkill switch is in the RFKILL_STATE_ON, the radio transmitter is
+*enabled*.  When the rfkill switch is in the RFKILL_STATE_OFF, the radio
+transmitter is *disabled*.
+
 The rfkill switch subsystem offers support for keys often found on laptops
 to enable wireless devices like WiFi and Bluetooth.
 
diff --git a/trunk/include/linux/rfkill.h b/trunk/include/linux/rfkill.h
index e3ab21d7fc7f..ca89ae1b0219 100644
--- a/trunk/include/linux/rfkill.h
+++ b/trunk/include/linux/rfkill.h
@@ -44,8 +44,8 @@ enum rfkill_type {
 };
 
 enum rfkill_state {
-	RFKILL_STATE_OFF	= 0,
-	RFKILL_STATE_ON		= 1,
+	RFKILL_STATE_OFF	= 0,	/* Radio output blocked */
+	RFKILL_STATE_ON		= 1,	/* Radio output active */
 };
 
 /**
@@ -53,7 +53,7 @@ enum rfkill_state {
  * @name: Name of the switch.
  * @type: Radio type which the button controls, the value stored
  *	here should be a value from enum rfkill_type.
- * @state: State of the switch (on/off).
+ * @state: State of the switch, "ON" means radio can operate.
  * @user_claim_unsupported: Whether the hardware supports exclusive
  *	RF-kill control by userspace. Set this before registering.
  * @user_claim: Set when the switch is controlled exlusively by userspace.