diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-04-11 11:51:36 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-04-12 16:54:38 +0200 |
| commit | 44b3decb414919760c7327df05e63372c1bf5d9a (patch) | |
| tree | 9d75bd3b78eac1968008338a0b5c70419f399d05 /net | |
| parent | 60d9edd50b9b9c5b9cb434ebea7892057ae4b889 (diff) | |
| download | linux-stable-44b3decb414919760c7327df05e63372c1bf5d9a.tar.gz linux-stable-44b3decb414919760c7327df05e63372c1bf5d9a.tar.bz2 linux-stable-44b3decb414919760c7327df05e63372c1bf5d9a.zip | |
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')
| -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, static const char *rfkill_get_type_str(enum rfkill_type type) { - BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1); + BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_NFC + 1); switch (type) { case RFKILL_TYPE_WLAN: @@ -604,6 +604,8 @@ static const char *rfkill_get_type_str(enum rfkill_type type) return "gps"; case RFKILL_TYPE_FM: return "fm"; + case RFKILL_TYPE_NFC: + return "nfc"; default: BUG(); } |