From a81e86faba63d834eed4cf1b9f3e5304cb45ed0d Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 13 Nov 2008 15:37:21 -0800
Subject: Staging: rt2860: Fix minor compiler warnings

The build is "clean" now for this driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/rt2860/2860_main_dev.c   |    2 +-
 drivers/staging/rt2860/common/cmm_data.c |    3 ---
 drivers/staging/rt2860/sta/sync.c        |    2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

--- a/drivers/staging/rt2860/2860_main_dev.c
+++ b/drivers/staging/rt2860/2860_main_dev.c
@@ -1022,7 +1022,7 @@ BOOLEAN RT28XXNetDevInit(
 	IN RTMP_ADAPTER 		*pAd)
 {
 	struct pci_dev *pci_dev = (struct pci_dev *)_dev_p;
-    CHAR	*print_name;
+    const CHAR	*print_name;
     ULONG	csr_addr;
 
 
--- a/drivers/staging/rt2860/common/cmm_data.c
+++ b/drivers/staging/rt2860/common/cmm_data.c
@@ -943,9 +943,6 @@ BOOLEAN RTMP_FillTxBlkInfo(
 	}
 
 	return TRUE;
-
-FillTxBlkErr:
-	return FALSE;
 }
 
 
--- a/drivers/staging/rt2860/sta/sync.c
+++ b/drivers/staging/rt2860/sta/sync.c
@@ -1300,8 +1300,6 @@ VOID PeerBeacon(
 						{
 							if (pAd->StaCfg.Adhoc20NJoined == FALSE)
 							{
-								UCHAR	ByteValue = 0;
-
 								pAd->CommonCfg.CentralChannel = pAd->CommonCfg.Channel;
 
 								pAd->StaCfg.Adhoc20NJoined = TRUE;