summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2013-12-09 23:08:35 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-10 23:14:26 -0800
commitc995c2f9ef67fda7740f571090894ea2ca2660eb (patch)
tree8406152fc2abea1bb1e423670218765ca2659471
parent8f248dae133668bfb8e9379b4b3f0571c858b24a (diff)
downloadlinux-c995c2f9ef67fda7740f571090894ea2ca2660eb.tar.bz2
staging: vt6656: Move double definition of MAX_RATE to device_cfg.h
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/datarate.h1
-rw-r--r--drivers/staging/vt6656/device_cfg.h2
-rw-r--r--drivers/staging/vt6656/mib.h1
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/vt6656/datarate.h b/drivers/staging/vt6656/datarate.h
index 43cb77894b66..96252adf1ea6 100644
--- a/drivers/staging/vt6656/datarate.h
+++ b/drivers/staging/vt6656/datarate.h
@@ -52,7 +52,6 @@
#define RATE_48M 10
#define RATE_54M 11
#define RATE_AUTO 12
-#define MAX_RATE 12
void RATEvParseMaxRate(struct vnt_private *, PWLAN_IE_SUPP_RATES pItemRates,
PWLAN_IE_SUPP_RATES pItemExtRates, int bUpdateBasicRate,
diff --git a/drivers/staging/vt6656/device_cfg.h b/drivers/staging/vt6656/device_cfg.h
index a97f7bb13db8..0b9d8349c2e4 100644
--- a/drivers/staging/vt6656/device_cfg.h
+++ b/drivers/staging/vt6656/device_cfg.h
@@ -65,6 +65,8 @@ struct _version {
#define DEVICE_VERSION "1.19_12"
#endif
+#define MAX_RATE 12
+
/* config file */
#include <linux/fs.h>
#include <linux/fcntl.h>
diff --git a/drivers/staging/vt6656/mib.h b/drivers/staging/vt6656/mib.h
index 5616b9a19735..c342dadf2546 100644
--- a/drivers/staging/vt6656/mib.h
+++ b/drivers/staging/vt6656/mib.h
@@ -222,7 +222,6 @@ typedef struct tagSTxPktInfo {
u8 abyDestAddr[ETH_ALEN];
} STxPktInfo, *PSTxPktInfo;
-#define MAX_RATE 12
//
// statistic counter
//