From 3660824925c2c8a5f8fe9babdd35813541ce74ca Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Mon, 8 Aug 2011 15:58:18 +0200
Subject: [PATCH] --- yaml --- r: 267421 b: refs/heads/master c:
 85567f52f2ba6159b98b066c792e5eb7cdc9bf0c h: refs/heads/master i:   267419:
 9f7d0ef15c9bc3f75e21de9a5b0f4a3b675c571d v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5e93383161ce..23498e3061bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 277195acd20a929b08db72fe73d62cf8da49d63c
+refs/heads/master: 85567f52f2ba6159b98b066c792e5eb7cdc9bf0c
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 3e7d5b273f1c..8cb34d673482 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -126,8 +126,8 @@ struct rte_console {
 	 * (at risk of conflicting with
 	 * the real UART).  vcons_out is currently unused.
 	 */
-	volatile uint vcons_in;
-	volatile uint vcons_out;
+	uint vcons_in;
+	uint vcons_out;
 
 	/* Output (logging) buffer
 	 * Console output is written to a ring buffer log_buf at index log_idx.