diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2013-04-11 05:51:36 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-04-12 10:54:38 -0400 |
commit | 44b3decb414919760c7327df05e63372c1bf5d9a (patch) | |
tree | 9d75bd3b78eac1968008338a0b5c70419f399d05 /net/rfkill | |
parent | 60d9edd50b9b9c5b9cb434ebea7892057ae4b889 (diff) |
rfkill: Add NFC to the list of supported radios
And return the proper string for it.
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/rfkill')
-rw-r--r-- | net/rfkill/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 9b9be5279f5d..1cec5e4f3a5e 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c | |||
@@ -587,7 +587,7 @@ static ssize_t rfkill_name_show(struct device *dev, | |||
587 | 587 | ||
588 | static const char *rfkill_get_type_str(enum rfkill_type type) | 588 | static const char *rfkill_get_type_str(enum rfkill_type type) |
589 | { | 589 | { |
590 | BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1); | 590 | BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_NFC + 1); |
591 | 591 | ||
592 | switch (type) { | 592 | switch (type) { |
593 | case RFKILL_TYPE_WLAN: | 593 | case RFKILL_TYPE_WLAN: |
@@ -604,6 +604,8 @@ static const char *rfkill_get_type_str(enum rfkill_type type) | |||
604 | return "gps"; | 604 | return "gps"; |
605 | case RFKILL_TYPE_FM: | 605 | case RFKILL_TYPE_FM: |
606 | return "fm"; | 606 | return "fm"; |
607 | case RFKILL_TYPE_NFC: | ||
608 | return "nfc"; | ||
607 | default: | 609 | default: |
608 | BUG(); | 610 | BUG(); |
609 | } | 611 | } |