diff options
Diffstat (limited to 'net/rfkill')
-rw-r--r-- | net/rfkill/Kconfig | 2 | ||||
-rw-r--r-- | net/rfkill/rfkill.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig index 8b31759ee8b0..d28a6d9303e4 100644 --- a/net/rfkill/Kconfig +++ b/net/rfkill/Kconfig | |||
@@ -5,7 +5,7 @@ menuconfig RFKILL | |||
5 | tristate "RF switch subsystem support" | 5 | tristate "RF switch subsystem support" |
6 | help | 6 | help |
7 | Say Y here if you want to have control over RF switches | 7 | Say Y here if you want to have control over RF switches |
8 | found on many WiFi, Bluetooth and IRDA cards. | 8 | found on many WiFi and Bluetooth cards. |
9 | 9 | ||
10 | To compile this driver as a module, choose M here: the | 10 | To compile this driver as a module, choose M here: the |
11 | module will be called rfkill. | 11 | module will be called rfkill. |
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 |