From 9d17dd1be61604f0ba35b093a08080aae4083d27 Mon Sep 17 00:00:00 2001
From: Luciano Coelho <coelho@ti.com>
Date: Thu, 10 May 2012 12:13:45 +0300
Subject: [PATCH] --- yaml --- r: 314086 b: refs/heads/master c:
 4b4887e9710158dca6efd3646ba87f1da03ebe8b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d1b87e87e960..8db08f95acf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 549562946fab225439bd6878982031ad6ce2aab9
+refs/heads/master: 4b4887e9710158dca6efd3646ba87f1da03ebe8b
diff --git a/trunk/drivers/net/wireless/ti/wl12xx/main.c b/trunk/drivers/net/wireless/ti/wl12xx/main.c
index 962d85d625de..02668557fef0 100644
--- a/trunk/drivers/net/wireless/ti/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/ti/wl12xx/main.c
@@ -596,7 +596,7 @@ static void wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
 {
 	if (wl->chip.id != CHIP_ID_1283_PG20) {
 		struct wl1271_acx_mem_map *wl_mem_map = wl->target_mem_map;
-		struct wl1271_rx_mem_pool_addr rx_mem_addr;
+		struct wl127x_rx_mem_pool_addr rx_mem_addr;
 
 		/*
 		 * Choose the block we want to read
diff --git a/trunk/drivers/net/wireless/ti/wl12xx/wl12xx.h b/trunk/drivers/net/wireless/ti/wl12xx/wl12xx.h
index 0d81c1e00b4a..de1132410876 100644
--- a/trunk/drivers/net/wireless/ti/wl12xx/wl12xx.h
+++ b/trunk/drivers/net/wireless/ti/wl12xx/wl12xx.h
@@ -24,6 +24,11 @@
 
 #include "conf.h"
 
+struct wl127x_rx_mem_pool_addr {
+	u32 addr;
+	u32 addr_extra;
+};
+
 struct wl12xx_priv {
 	struct wl12xx_priv_conf conf;
 
diff --git a/trunk/drivers/net/wireless/ti/wlcore/wlcore.h b/trunk/drivers/net/wireless/ti/wlcore/wlcore.h
index 89abbced7bae..f62152e35f3c 100644
--- a/trunk/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/trunk/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -213,9 +213,6 @@ struct wl1271 {
 	/* FW Rx counter */
 	u32 rx_counter;
 
-	/* Rx memory pool address */
-	struct wl1271_rx_mem_pool_addr rx_mem_pool_addr;
-
 	/* Intermediate buffer, used for packet aggregation */
 	u8 *aggr_buf;
 
diff --git a/trunk/drivers/net/wireless/ti/wlcore/wlcore_i.h b/trunk/drivers/net/wireless/ti/wlcore/wlcore_i.h
index 819c97cdc162..53263a978a75 100644
--- a/trunk/drivers/net/wireless/ti/wlcore/wlcore_i.h
+++ b/trunk/drivers/net/wireless/ti/wlcore/wlcore_i.h
@@ -194,11 +194,6 @@ struct wl_fw_status {
 	u8 priv[0];
 } __packed;
 
-struct wl1271_rx_mem_pool_addr {
-	u32 addr;
-	u32 addr_extra;
-};
-
 #define WL1271_MAX_CHANNELS 64
 struct wl1271_scan {
 	struct cfg80211_scan_request *req;