From 806073c065b3fab73abd076d3dd9dcd7cb479e18 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 13 Sep 2010 21:23:57 -0700
Subject: [PATCH] --- yaml --- r: 219882 b: refs/heads/master c:
 03a6cddbb81a9de87b40b1d528397a160269264e h: refs/heads/master v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c | 14 +++++++-------
 trunk/drivers/staging/bcm/Debug.c                  |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index c9cc668d0705..b9184033f629 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a09eae8550c135a70dda507b5757aac1341b9b44
+refs/heads/master: 03a6cddbb81a9de87b40b1d528397a160269264e
diff --git a/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 03ece0f8c6d4..c2947bc051dd 100644
--- a/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -5075,13 +5075,13 @@ ar6000_hbChallengeResp_event(AR_SOFTC_T *ar, A_UINT32 cookie, A_UINT32 source)
 void
 ar6000_reportError_event(AR_SOFTC_T *ar, WMI_TARGET_ERROR_VAL errorVal)
 {
-    char    *errString[] = {
-                [WMI_TARGET_PM_ERR_FAIL]    "WMI_TARGET_PM_ERR_FAIL",
-                [WMI_TARGET_KEY_NOT_FOUND]  "WMI_TARGET_KEY_NOT_FOUND",
-                [WMI_TARGET_DECRYPTION_ERR] "WMI_TARGET_DECRYPTION_ERR",
-                [WMI_TARGET_BMISS]          "WMI_TARGET_BMISS",
-                [WMI_PSDISABLE_NODE_JOIN]   "WMI_PSDISABLE_NODE_JOIN"
-                };
+	static const char * const errString[] = {
+		[WMI_TARGET_PM_ERR_FAIL]    "WMI_TARGET_PM_ERR_FAIL",
+		[WMI_TARGET_KEY_NOT_FOUND]  "WMI_TARGET_KEY_NOT_FOUND",
+		[WMI_TARGET_DECRYPTION_ERR] "WMI_TARGET_DECRYPTION_ERR",
+		[WMI_TARGET_BMISS]          "WMI_TARGET_BMISS",
+		[WMI_PSDISABLE_NODE_JOIN]   "WMI_PSDISABLE_NODE_JOIN"
+	};
 
     A_PRINTF("AR6000 Error on Target. Error = 0x%x\n", errorVal);
 
diff --git a/trunk/drivers/staging/bcm/Debug.c b/trunk/drivers/staging/bcm/Debug.c
index 213f4bcc5dfc..d01eb120500a 100644
--- a/trunk/drivers/staging/bcm/Debug.c
+++ b/trunk/drivers/staging/bcm/Debug.c
@@ -1,12 +1,13 @@
 #include "headers.h"
 
-char *buff_dump_base[]={"DEC", "HEX",  "OCT", "BIN"	};
-
 static UINT current_debug_level=BCM_SCREAM;
 
 int bcm_print_buffer( UINT debug_level, const char *function_name,
 				  char *file_name, int line_number, unsigned char *buffer, int bufferlen, unsigned int base)
 {
+	static const char * const buff_dump_base[] = {
+		"DEC", "HEX", "OCT", "BIN"
+	};
 	if(debug_level>=current_debug_level)
 	{
 		int i=0;