From: Malcolm Priestley Date: Mon, 9 Dec 2013 23:08:35 +0000 (+0000) Subject: staging: vt6656: Move double definition of MAX_RATE to device_cfg.h X-Git-Tag: v3.14-rc1~13^2~487 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c995c2f9ef67fda7740f571090894ea2ca2660eb;p=platform%2Fkernel%2Flinux-exynos.git staging: vt6656: Move double definition of MAX_RATE to device_cfg.h Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/datarate.h b/drivers/staging/vt6656/datarate.h index 43cb778..96252ad 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 a97f7bb..0b9d834 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 #include diff --git a/drivers/staging/vt6656/mib.h b/drivers/staging/vt6656/mib.h index 5616b9a1..c342dad 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 //