aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-11-18 10:48:01 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-18 17:09:26 -0500
commit875405a7793e9c35fab33819e7e5df7a98b6064c (patch)
tree7696916f19a3e69ac06c76bd4ca3124e4360ea50
parent0878c3504f92f1bf063d0890a9960d4b9e6c4618 (diff)
rfkill: Add constant for RFKILL_TYPE_FM radio devices
Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Janakiram Sistla <janakiram.sistla@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--include/linux/rfkill.h2
-rw-r--r--net/rfkill/core.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index a75e9e566ce5..97059d08a626 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -36,6 +36,7 @@
36 * @RFKILL_TYPE_WIMAX: switch is on a WiMAX device. 36 * @RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
37 * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device. 37 * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device.
38 * @RFKILL_TYPE_GPS: switch is on a GPS device. 38 * @RFKILL_TYPE_GPS: switch is on a GPS device.
39 * @RFKILL_TYPE_FM: switch is on a FM radio device.
39 * @NUM_RFKILL_TYPES: number of defined rfkill types 40 * @NUM_RFKILL_TYPES: number of defined rfkill types
40 */ 41 */
41enum rfkill_type { 42enum rfkill_type {
@@ -46,6 +47,7 @@ enum rfkill_type {
46 RFKILL_TYPE_WIMAX, 47 RFKILL_TYPE_WIMAX,
47 RFKILL_TYPE_WWAN, 48 RFKILL_TYPE_WWAN,
48 RFKILL_TYPE_GPS, 49 RFKILL_TYPE_GPS,
50 RFKILL_TYPE_FM,
49 NUM_RFKILL_TYPES, 51 NUM_RFKILL_TYPES,
50}; 52};
51 53
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index ba2efb960c60..09f4e161799b 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -592,11 +592,13 @@ static const char *rfkill_get_type_str(enum rfkill_type type)
592 return "wwan"; 592 return "wwan";
593 case RFKILL_TYPE_GPS: 593 case RFKILL_TYPE_GPS:
594 return "gps"; 594 return "gps";
595 case RFKILL_TYPE_FM:
596 return "fm";
595 default: 597 default:
596 BUG(); 598 BUG();
597 } 599 }
598 600
599 BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_GPS + 1); 601 BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1);
600} 602}
601 603
602static ssize_t rfkill_type_show(struct device *dev, 604static ssize_t rfkill_type_show(struct device *dev,