From 03edac361613e91f267622a9035a24df379739bb Mon Sep 17 00:00:00 2001
From: Luciano Coelho <coelho@ti.com>
Date: Thu, 7 Jun 2012 23:39:24 +0300
Subject: [PATCH] --- yaml --- r: 314167 b: refs/heads/master c:
 648f6ed9f7f0e4d56d65266734e748a02f8e2df7 h: refs/heads/master i:   314165:
 3d31ee1ea433754d3bc7b3dd951c76a4fca68e22   314163:
 666633ca2b8129d8094747a166d23afb088e945a   314159:
 99a1da43b4555638225d71e1a0d81de09df16412 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ti/wl12xx/main.c | 2 +-
 trunk/drivers/net/wireless/ti/wl18xx/main.c | 2 +-
 trunk/drivers/net/wireless/ti/wlcore/conf.h | 9 +++++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3ae1187ac5fd..9d3851bd22c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c6ead570c6b88b865fca15bdc0d09e2d90d2130
+refs/heads/master: 648f6ed9f7f0e4d56d65266734e748a02f8e2df7
diff --git a/trunk/drivers/net/wireless/ti/wl12xx/main.c b/trunk/drivers/net/wireless/ti/wl12xx/main.c
index 8338045d226f..85d1600ee340 100644
--- a/trunk/drivers/net/wireless/ti/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/ti/wl12xx/main.c
@@ -253,7 +253,7 @@ static struct wlcore_conf wl12xx_conf = {
 	},
 	.pm_config = {
 		.host_clk_settling_time = 5000,
-		.host_fast_wakeup_support = false
+		.host_fast_wakeup_support = CONF_FAST_WAKEUP_DISABLE,
 	},
 	.roam_trigger = {
 		.trigger_pacing               = 1,
diff --git a/trunk/drivers/net/wireless/ti/wl18xx/main.c b/trunk/drivers/net/wireless/ti/wl18xx/main.c
index fd02795f830c..b6a80cd5e9ef 100644
--- a/trunk/drivers/net/wireless/ti/wl18xx/main.c
+++ b/trunk/drivers/net/wireless/ti/wl18xx/main.c
@@ -376,7 +376,7 @@ static struct wlcore_conf wl18xx_conf = {
 	},
 	.pm_config = {
 		.host_clk_settling_time = 5000,
-		.host_fast_wakeup_support = false
+		.host_fast_wakeup_support = CONF_FAST_WAKEUP_DISABLE,
 	},
 	.roam_trigger = {
 		.trigger_pacing               = 1,
diff --git a/trunk/drivers/net/wireless/ti/wlcore/conf.h b/trunk/drivers/net/wireless/ti/wlcore/conf.h
index d2c4885d0d77..2e84ae113fce 100644
--- a/trunk/drivers/net/wireless/ti/wlcore/conf.h
+++ b/trunk/drivers/net/wireless/ti/wlcore/conf.h
@@ -981,6 +981,11 @@ struct conf_itrim_settings {
 	u32 timeout;
 };
 
+enum conf_fast_wakeup {
+	CONF_FAST_WAKEUP_ENABLE,
+	CONF_FAST_WAKEUP_DISABLE,
+};
+
 struct conf_pm_config_settings {
 	/*
 	 * Host clock settling time
@@ -992,9 +997,9 @@ struct conf_pm_config_settings {
 	/*
 	 * Host fast wakeup support
 	 *
-	 * Range: true, false
+	 * Range: enum conf_fast_wakeup
 	 */
-	bool host_fast_wakeup_support;
+	u8 host_fast_wakeup_support;
 };
 
 struct conf_roam_trigger_settings {