aboutsummaryrefslogtreecommitdiffstats
path: root/net/rfkill/rfkill.c
diff options
context:
space:
mode:
authorIvo van Doorn <IvDoorn@gmail.com>2007-09-13 03:20:42 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:23 -0400
commit234a0ca6f1d67ba4c3c3fc8378bbd98d722468e1 (patch)
treea744629408146be683dfbef5c18f1f8bb433f3b7 /net/rfkill/rfkill.c
parent077130c0cf7d5ba1992f5b51b96136d7b1c8aad5 (diff)
[RFKILL]: Remove IRDA
As Dmitry pointed out earlier, rfkill-input.c doesn't support irda because there are no users and we shouldn't add unrequired KEY_ defines. However, RFKILL_TYPE_IRDA was defined in the rfkill.h header file and would confuse people about whether it is implemented or not. This patch removes IRDA support completely, so it can be added whenever a driver wants the feature. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rfkill/rfkill.c')
-rw-r--r--net/rfkill/rfkill.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index db3395bfbcfa..50e010272e47 100644
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -106,9 +106,6 @@ static ssize_t rfkill_type_show(struct device *dev,
106 case RFKILL_TYPE_BLUETOOTH: 106 case RFKILL_TYPE_BLUETOOTH:
107 type = "bluetooth"; 107 type = "bluetooth";
108 break; 108 break;
109 case RFKILL_TYPE_IRDA:
110 type = "irda";
111 break;
112 default: 109 default:
113 BUG(); 110 BUG();
114 } 111 }
@@ -281,7 +278,7 @@ static void rfkill_remove_switch(struct rfkill *rfkill)
281/** 278/**
282 * rfkill_allocate - allocate memory for rfkill structure. 279 * rfkill_allocate - allocate memory for rfkill structure.
283 * @parent: device that has rf switch on it 280 * @parent: device that has rf switch on it
284 * @type: type of the switch (wlan, bluetooth, irda) 281 * @type: type of the switch (RFKILL_TYPE_*)
285 * 282 *
286 * This function should be called by the network driver when it needs 283 * This function should be called by the network driver when it needs
287 * rfkill structure. Once the structure is allocated the driver shoud 284 * rfkill structure. Once the structure is allocated the driver shoud