From d496e863b2d7cf0a2e5e20d775a093790301f9a2 Mon Sep 17 00:00:00 2001
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Wed, 14 Nov 2012 12:32:50 +0200
Subject: [PATCH] --- yaml --- r: 341567 b: refs/heads/master c:
 b55e57f53f8740a2d1432e4963372d303b798530 h: refs/heads/master i:   341565:
 9341f1fbe90c849960fd96b3cb83ff442e3b1254   341563:
 e64baec0ebcf2ee73ab9f65fc2a8cd6af4fbd53c   341559:
 ae5d0c63030c15394ff572fa8e216234f153ee06   341551:
 77a8e04601280e3274de6de924a2078f2a0dea28   341535:
 df38bb9cf543ffcf25cd9d95a23dd3328c494fbb   341503:
 684d61f3954b15c0949ac06628eaf02cc99028cd v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/net/wireless/iwlwifi/pcie/internal.h | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ef224b636024..5fefeed72065 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f904b382ff61b8ec1f81f8afe76f12a5ac8b4cf
+refs/heads/master: b55e57f53f8740a2d1432e4963372d303b798530
diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h b/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h
index 1f065c630d43..ebf3aa0fedf2 100644
--- a/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h
+++ b/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h
@@ -287,10 +287,16 @@ struct iwl_trans_pcie {
 	unsigned long wd_timeout;
 };
 
-/*****************************************************
-* DRIVER STATUS FUNCTIONS
-******************************************************/
-enum {
+/**
+ * enum iwl_pcie_status: status of the PCIe transport
+ * @STATUS_HCMD_ACTIVE: a SYNC command is being processed
+ * @STATUS_DEVICE_ENABLED: APM is enabled
+ * @STATUS_TPOWER_PMI: the device might be asleep (need to wake it up)
+ * @STATUS_INT_ENABLED: interrupts are enabled
+ * @STATUS_RFKILL: the HW RFkill switch is in KILL position
+ * @STATUS_FW_ERROR: the fw is in error state
+ */
+enum iwl_pcie_status {
 	STATUS_HCMD_ACTIVE,
 	STATUS_DEVICE_ENABLED,
 	STATUS_TPOWER_PMI,