diff options
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_BAProc.c | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl_core.h | 7 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl_pci.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl_ps.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_debug.h (renamed from drivers/staging/rtl8192e/rtl_debug.h) | 5 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_module.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_softmac.c | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_softmac_wx.c | 1 |
9 files changed, 11 insertions, 10 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 8b9d85c..32fbbc9 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -18,7 +18,6 @@ ******************************************************************************/ #include "rtllib.h" #include "rtl819x_BA.h" -#include "rtl_core.h" static void ActivateBAEntry(struct rtllib_device *ieee, struct ba_record *pBA, u16 Time) diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h index c8a7459..46407ef 100644 --- a/drivers/staging/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl_core.h @@ -46,6 +46,10 @@ #include <linux/random.h> #include <linux/version.h> #include <linux/io.h> + +/* Need this defined before including local include files */ +#define DRV_NAME "rtl819xE" + #include "rtllib.h" #include "dot11d.h" @@ -56,7 +60,6 @@ #include "r8190P_def.h" #include "r8192E_dev.h" -#include "rtl_debug.h" #include "rtl_eeprom.h" #include "rtl_ps.h" #include "rtl_pci.h" @@ -67,8 +70,6 @@ #define DRV_AUTHOR "<wlanfae@realtek.com>" #define DRV_VERSION "0014.0401.2010" -#define DRV_NAME "rtl819xE" - #define IS_HARDWARE_TYPE_819xP(_priv) \ ((((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8190P) || \ (((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192E)) diff --git a/drivers/staging/rtl8192e/rtl_pci.h b/drivers/staging/rtl8192e/rtl_pci.h index 7ea5a47..28c7da6 100644 --- a/drivers/staging/rtl8192e/rtl_pci.h +++ b/drivers/staging/rtl8192e/rtl_pci.h @@ -27,7 +27,6 @@ #include <linux/types.h> #include <linux/pci.h> -#include "rtllib.h" static inline void NdisRawWritePortUlong(u32 port, u32 val) { diff --git a/drivers/staging/rtl8192e/rtl_ps.h b/drivers/staging/rtl8192e/rtl_ps.h index a9c2d79..df79d6c 100644 --- a/drivers/staging/rtl8192e/rtl_ps.h +++ b/drivers/staging/rtl8192e/rtl_ps.h @@ -26,7 +26,7 @@ #define _RTL_PS_H #include <linux/types.h> -#include "rtllib.h" + struct net_device; #define RT_CHECK_FOR_HANG_PERIOD 2 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 3a52120..3228d36 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -36,6 +36,7 @@ #include <linux/delay.h> #include <linux/wireless.h> +#include "rtllib_debug.h" #include "rtl819x_HT.h" #include "rtl819x_BA.h" #include "rtl819x_TS.h" diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtllib_debug.h index b376b6b..2bfc115 100644 --- a/drivers/staging/rtl8192e/rtl_debug.h +++ b/drivers/staging/rtl8192e/rtllib_debug.h @@ -25,6 +25,11 @@ #ifndef _RTL_DEBUG_H #define _RTL_DEBUG_H +/* Allow files to override DRV_NAME */ +#ifndef DRV_NAME +#define DRV_NAME "rtllib_92e" +#endif + #define DMESG(x, a...) extern u32 rt_global_debug_component; diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c index c36a140..a995cd0 100644 --- a/drivers/staging/rtl8192e/rtllib_module.c +++ b/drivers/staging/rtl8192e/rtllib_module.c @@ -54,8 +54,6 @@ #include "rtllib.h" -#define DRV_NAME "rtllib_92e" - void _setup_timer(struct timer_list *ptimer, void *fun, unsigned long data) { ptimer->function = fun; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index a326880..4ed65dc 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -15,7 +15,6 @@ #include "rtllib.h" -#include "rtl_core.h" #include <linux/random.h> #include <linux/delay.h> diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index 22988fb..5bd7626 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -15,7 +15,6 @@ #include "rtllib.h" -#include "rtl_core.h" #include "dot11d.h" /* FIXME: add A freqs */ |
