From patchwork Tue Jan 19 07:05:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Winkler, Tomas" X-Patchwork-Id: 73808 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0J75R2h018091 for ; Tue, 19 Jan 2010 07:05:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754033Ab0ASHF0 (ORCPT ); Tue, 19 Jan 2010 02:05:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753233Ab0ASHF0 (ORCPT ); Tue, 19 Jan 2010 02:05:26 -0500 Received: from mga11.intel.com ([192.55.52.93]:9861 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752075Ab0ASHFZ (ORCPT ); Tue, 19 Jan 2010 02:05:25 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 18 Jan 2010 23:04:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,300,1262592000"; d="scan'208";a="765366845" Received: from jrlmcp01.jer.intel.com (HELO localhost.localdomain) ([10.12.85.15]) by fmsmga001.fm.intel.com with ESMTP; 18 Jan 2010 23:05:22 -0800 From: Tomas Winkler To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Tomas Winkler Subject: [PATCH 1/1] update rfkill.h from kernel 2.6.33 Date: Tue, 19 Jan 2010 09:05:21 +0200 Message-Id: <1263884721-11008-1-git-send-email-tomas.winkler@intel.com> X-Mailer: git-send-email 1.6.0.6 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/rfkill.c b/rfkill.c index 216e6ac..3f71181 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 3392c59..97059d0 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, };