diff options
| author |   Ivo van Doorn <IvDoorn@gmail.com> | 2007-09-13 09:20:42 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:49:23 -0700 |
| commit | 234a0ca6f1d67ba4c3c3fc8378bbd98d722468e1 (patch) | |
| tree | a744629408146be683dfbef5c18f1f8bb433f3b7 /net/rfkill/rfkill.c | |
| parent | [NET]: Fix race when opening a proc file while a network namespace is exiting. (diff) | |
| download | linux-dev-234a0ca6f1d67ba4c3c3fc8378bbd98d722468e1.tar.xz linux-dev-234a0ca6f1d67ba4c3c3fc8378bbd98d722468e1.zip | |
[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 '')
| -rw-r--r-- | net/rfkill/rfkill.c | 5 |
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, 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 |