---

yaml --- r: 318186 b: refs/heads/master c: eaae2e9 h: refs/heads/master v: v3
git-mirror · Jul 20, 2012 · 2e8d11d · 2e8d11d
1 parent e4b75f7
commit 2e8d11d
Show file tree

Hide file tree

Showing 37 changed files with 2 additions and 135 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 786eeeb3756e7fb08174c3a136c16462ccd541d1
+refs/heads/master: eaae2e9223e859cd968b58bd3173a3f17b50538d
diff --git a/trunk/drivers/staging/csr/csr_msgconv.c b/trunk/drivers/staging/csr/csr_msgconv.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_panic.h"
 #include "csr_sched.h"
 #include "csr_msgconv.h"

diff --git a/trunk/drivers/staging/csr/csr_pmem.h b/trunk/drivers/staging/csr/csr_pmem.h
diff --git a/trunk/drivers/staging/csr/csr_serialize_primitive_types.c b/trunk/drivers/staging/csr/csr_serialize_primitive_types.c
@@ -13,7 +13,6 @@
 #include "csr_prim_defs.h"
 #include "csr_msgconv.h"
 #include "csr_macro.h"
-#include "csr_pmem.h"
 #include "csr_lib.h"
 
 void CsrUint8Des(u8 *value, u8 *buffer, size_t *offset)

diff --git a/trunk/drivers/staging/csr/csr_utf16.c b/trunk/drivers/staging/csr/csr_utf16.c
@@ -9,7 +9,6 @@
 *****************************************************************************/
 #include <linux/module.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_unicode.h"
 #include "csr_macro.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_fsm.h b/trunk/drivers/staging/csr/csr_wifi_fsm.h
@@ -15,7 +15,6 @@
 extern "C" {
 #endif
 
-#include "csr_pmem.h"
 #include "csr_prim_defs.h"
 #include "csr_log_text.h"
 #include "csr_wifi_fsm_event.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_fsm_types.h b/trunk/drivers/staging/csr/csr_wifi_fsm_types.h
@@ -17,7 +17,6 @@ extern "C" {
 
 #include <linux/types.h>
 #include "csr_macro.h"
-#include "csr_pmem.h"
 #include "csr_panic.h"
 #include "csr_sched.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_unifi.h b/trunk/drivers/staging/csr/csr_wifi_hip_unifi.h
@@ -97,7 +97,6 @@ extern "C" {
 
 #include "csr_framework_ext.h"  /* from the synergy porting folder */
 #include "csr_sdio.h"           /* from the synergy porting folder */
-#include "csr_pmem.h"           /* from the synergy porting folder */
 #include "csr_macro.h"          /* from the synergy porting folder */
 #include "csr_formatted_io.h"   /* from the synergy gsp folder */
 #include "csr_wifi_result.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c b/trunk/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 
 #include "csr_msgconv.h"
-#include "csr_pmem.h"
 #include "csr_macro.h"
 
 #ifdef CSR_WIFI_NME_ENABLE

diff --git a/trunk/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c b/trunk/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_nme_ap_prim.h"
 #include "csr_wifi_nme_ap_lib.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c b/trunk/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 
-#include "csr_pmem.h"
 #include "csr_wifi_nme_ap_prim.h"
 #include "csr_wifi_nme_ap_lib.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/trunk/drivers/staging/csr/csr_wifi_nme_ap_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_NME_AP_LIB_H__
 #define CSR_WIFI_NME_AP_LIB_H__
 
-#include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/trunk/drivers/staging/csr/csr_wifi_nme_ap_prim.h
@@ -13,6 +13,7 @@
 #ifndef CSR_WIFI_NME_AP_PRIM_H__
 #define CSR_WIFI_NME_AP_PRIM_H__
 
+#include <linux/types.h>
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 #include "csr_wifi_common.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_nme_ap_serialize.c b/trunk/drivers/staging/csr/csr_wifi_nme_ap_serialize.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 #include <linux/string.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_msgconv.h"
 #include "csr_unicode.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_nme_ap_serialize.h b/trunk/drivers/staging/csr/csr_wifi_nme_ap_serialize.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_NME_AP_SERIALIZE_H__
 #define CSR_WIFI_NME_AP_SERIALIZE_H__
 
-#include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
 
 #include "csr_wifi_nme_ap_prim.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_nme_lib.h b/trunk/drivers/staging/csr/csr_wifi_nme_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_NME_LIB_H__
 #define CSR_WIFI_NME_LIB_H__
 
-#include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_nme_serialize.h b/trunk/drivers/staging/csr/csr_wifi_nme_serialize.h
@@ -13,9 +13,7 @@
 #ifndef CSR_WIFI_NME_SERIALIZE_H__
 #define CSR_WIFI_NME_SERIALIZE_H__
 
-#include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
-
 #include "csr_wifi_nme_prim.h"
 
 #ifdef __cplusplus

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_converter_init.c b/trunk/drivers/staging/csr/csr_wifi_router_converter_init.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 
 #include "csr_msgconv.h"
-#include "csr_pmem.h"
 #include "csr_macro.h"
 
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c b/trunk/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 
 #include "csr_msgconv.h"
-#include "csr_pmem.h"
 #include "csr_macro.h"
 
 #ifdef CSR_LOG_ENABLE

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c b/trunk/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_router_ctrl_prim.h"
 #include "csr_wifi_router_ctrl_lib.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c b/trunk/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_router_ctrl_prim.h"
 #include "csr_wifi_router_ctrl_lib.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/trunk/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_ROUTER_CTRL_LIB_H__
 #define CSR_WIFI_ROUTER_CTRL_LIB_H__
 
-#include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c b/trunk/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 #include <linux/string.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_msgconv.h"
 #include "csr_unicode.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h b/trunk/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__
 #define CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__
 
-#include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
 
 #include "csr_wifi_router_ctrl_prim.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c b/trunk/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_router_prim.h"
 #include "csr_wifi_router_lib.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c b/trunk/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_router_prim.h"
 #include "csr_wifi_router_lib.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_lib.h b/trunk/drivers/staging/csr/csr_wifi_router_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_ROUTER_LIB_H__
 #define CSR_WIFI_ROUTER_LIB_H__
 
-#include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_serialize.c b/trunk/drivers/staging/csr/csr_wifi_router_serialize.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_msgconv.h"
 #include "csr_unicode.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_router_serialize.h b/trunk/drivers/staging/csr/csr_wifi_router_serialize.h
@@ -13,9 +13,7 @@
 #ifndef CSR_WIFI_ROUTER_SERIALIZE_H__
 #define CSR_WIFI_ROUTER_SERIALIZE_H__
 
-#include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
-
 #include "csr_wifi_router_prim.h"
 
 #ifdef __cplusplus

diff --git a/trunk/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/trunk/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
@@ -10,7 +10,6 @@
 
 #include <linux/module.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_macro.h"
 #include "csr_msgconv.h"
 #include "csr_wifi_msgconv.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/trunk/drivers/staging/csr/csr_wifi_sme_ap_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_SME_AP_LIB_H__
 #define CSR_WIFI_SME_AP_LIB_H__
 
-#include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_sme_converter_init.c b/trunk/drivers/staging/csr/csr_wifi_sme_converter_init.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 
 #include "csr_msgconv.h"
-#include "csr_pmem.h"
 #include "csr_macro.h"
 
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c b/trunk/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_sme_prim.h"
 #include "csr_wifi_sme_lib.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c b/trunk/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_sme_prim.h"
 #include "csr_wifi_sme_lib.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_sme_lib.h b/trunk/drivers/staging/csr/csr_wifi_sme_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_SME_LIB_H__
 #define CSR_WIFI_SME_LIB_H__
 
-#include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/trunk/drivers/staging/csr/csr_wifi_sme_serialize.c b/trunk/drivers/staging/csr/csr_wifi_sme_serialize.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 #include <linux/string.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_msgconv.h"
 #include "csr_unicode.h"
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_sme_serialize.h b/trunk/drivers/staging/csr/csr_wifi_sme_serialize.h
@@ -13,9 +13,7 @@
 #ifndef CSR_WIFI_SME_SERIALIZE_H__
 #define CSR_WIFI_SME_SERIALIZE_H__
 
-#include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
-
 #include "csr_wifi_sme_prim.h"
 
 #ifdef __cplusplus