From ba112d19c733763d815dbd5db90543150c952571 Mon Sep 17 00:00:00 2001
From: Ivo van Doorn <IvDoorn@gmail.com>
Date: Thu, 13 Sep 2007 09:20:42 +0200
Subject: [PATCH] --- yaml --- r: 66409 b: refs/heads/master c:
 234a0ca6f1d67ba4c3c3fc8378bbd98d722468e1 h: refs/heads/master i:   66407:
 deda9db49c6680a1186d5898a2dd44ac5f9ab7c2 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/rfkill.h | 8 +++-----
 trunk/net/rfkill/Kconfig     | 2 +-
 trunk/net/rfkill/rfkill.c    | 5 +----
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 8e3b9de7bfc2..0149f58dc163 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 077130c0cf7d5ba1992f5b51b96136d7b1c8aad5
+refs/heads/master: 234a0ca6f1d67ba4c3c3fc8378bbd98d722468e1
diff --git a/trunk/include/linux/rfkill.h b/trunk/include/linux/rfkill.h
index a8a6ea809da0..c4546e15c853 100644
--- a/trunk/include/linux/rfkill.h
+++ b/trunk/include/linux/rfkill.h
@@ -31,13 +31,11 @@
  * enum rfkill_type - type of rfkill switch.
  * RFKILL_TYPE_WLAN: switch is no a Wireless network devices.
  * RFKILL_TYPE_BlUETOOTH: switch is on a bluetooth device.
- * RFKILL_TYPE_IRDA: switch is on an infrared devices.
  */
 enum rfkill_type {
-	RFKILL_TYPE_WLAN = 0,
-	RFKILL_TYPE_BLUETOOTH = 1,
-	RFKILL_TYPE_IRDA = 2,
-	RFKILL_TYPE_MAX = 3,
+	RFKILL_TYPE_WLAN ,
+	RFKILL_TYPE_BLUETOOTH,
+	RFKILL_TYPE_MAX,
 };
 
 enum rfkill_state {
diff --git a/trunk/net/rfkill/Kconfig b/trunk/net/rfkill/Kconfig
index 8b31759ee8b0..d28a6d9303e4 100644
--- a/trunk/net/rfkill/Kconfig
+++ b/trunk/net/rfkill/Kconfig
@@ -5,7 +5,7 @@ menuconfig RFKILL
 	tristate "RF switch subsystem support"
 	help
 	  Say Y here if you want to have control over RF switches
-	  found on many WiFi, Bluetooth and IRDA cards.
+	  found on many WiFi and Bluetooth cards.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called rfkill.
diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c
index db3395bfbcfa..50e010272e47 100644
--- a/trunk/net/rfkill/rfkill.c
+++ b/trunk/net/rfkill/rfkill.c
@@ -106,9 +106,6 @@ static ssize_t rfkill_type_show(struct device *dev,
 	case RFKILL_TYPE_BLUETOOTH:
 		type = "bluetooth";
 		break;
-	case RFKILL_TYPE_IRDA:
-		type = "irda";
-		break;
 	default:
 		BUG();
 	}
@@ -281,7 +278,7 @@ static void rfkill_remove_switch(struct rfkill *rfkill)
 /**
  * rfkill_allocate - allocate memory for rfkill structure.
  * @parent: device that has rf switch on it
- * @type: type of the switch (wlan, bluetooth, irda)
+ * @type: type of the switch (RFKILL_TYPE_*)
  *
  * This function should be called by the network driver when it needs
  * rfkill structure. Once the structure is allocated the driver shoud