From: Tomas Winkler <tomas.winkler@intel.com>
Date: Tue, 19 Jan 2010 07:05:21 +0000 (+0200)
Subject: update rfkill.h from kernel 2.6.33
X-Git-Tag: v2.31-rc1~98^2~13^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce38452794791c71c8985b95f1c8fd1d6b19f222;p=thirdparty%2Futil-linux.git

update rfkill.h from kernel 2.6.33

1. add FM radio type
2. update rfkill_type docs

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---

diff --git a/rfkill.c b/rfkill.c
index 216e6ac2a3..3f71181b8e 100644
--- a/rfkill.c
+++ b/rfkill.c
@@ -109,6 +109,8 @@ static const char *type2string(enum rfkill_type type)
 		return "Wireless WAN";
 	case RFKILL_TYPE_GPS:
 		return "GPS";
+	case RFKILL_TYPE_FM:
+		return "FM";
 	case NUM_RFKILL_TYPES:
 		return NULL;
 	}
@@ -203,6 +205,7 @@ static struct rfkill_type_str rfkill_type_strings[] = {
 	{	.type = RFKILL_TYPE_WIMAX,		.name = "wimax"	},
 	{	.type = RFKILL_TYPE_WWAN,		.name = "wwan"	},
 	{	.type = RFKILL_TYPE_GPS,		.name = "gps"	},
+	{	.type = RFKILL_TYPE_FM,			.name = "fm"	},
 	{	.name = NULL }
 };
 
diff --git a/rfkill.h b/rfkill.h
index 3392c59d27..97059d08a6 100644
--- a/rfkill.h
+++ b/rfkill.h
@@ -35,6 +35,8 @@
  * @RFKILL_TYPE_UWB: switch is on a ultra wideband device.
  * @RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
  * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device.
+ * @RFKILL_TYPE_GPS: switch is on a GPS device.
+ * @RFKILL_TYPE_FM: switch is on a FM radio device.
  * @NUM_RFKILL_TYPES: number of defined rfkill types
  */
 enum rfkill_type {
@@ -45,6 +47,7 @@ enum rfkill_type {
 	RFKILL_TYPE_WIMAX,
 	RFKILL_TYPE_WWAN,
 	RFKILL_TYPE_GPS,
+	RFKILL_TYPE_FM,
 	NUM_RFKILL_TYPES,
 };