From: Bartlomiej Zolnierkiewicz Date: Sun, 26 Apr 2009 14:04:32 +0000 (+0200) Subject: Staging: rt3070: remove dead *WSC_INCLUDED code X-Git-Tag: v2.6.31-rc1~105^2~170 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c96ffc59c0a62f353e47daeff85a1ee98be9a71;p=karo-tx-linux.git Staging: rt3070: remove dead *WSC_INCLUDED code Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rt3070/rt_config.h b/drivers/staging/rt3070/rt_config.h index 9e06417f63d3..9db8a713b221 100644 --- a/drivers/staging/rt3070/rt_config.h +++ b/drivers/staging/rt3070/rt_config.h @@ -72,11 +72,6 @@ #include "mlme_ex.h" #endif // MLME_EX // -#undef AP_WSC_INCLUDED -#undef STA_WSC_INCLUDED -#undef WSC_INCLUDED - - #ifdef LEAP_SUPPORT #include "leap.h" #endif // LEAP_SUPPORT // @@ -96,13 +91,6 @@ #include "rt_ate.h" #endif // RALINK_ATE // - - -#if defined(AP_WSC_INCLUDED) || defined(STA_WSC_INCLUDED) -#define WSC_INCLUDED -#endif - - #ifdef CONFIG_STA_SUPPORT #ifdef NATIVE_WPA_SUPPLICANT_SUPPORT #ifndef WPA_SUPPLICANT_SUPPORT diff --git a/drivers/staging/rt3070/rt_linux.h b/drivers/staging/rt3070/rt_linux.h index 81e420f1066e..d1a2da1fe35a 100644 --- a/drivers/staging/rt3070/rt_linux.h +++ b/drivers/staging/rt3070/rt_linux.h @@ -538,20 +538,6 @@ DECLARE_TIMER_FUNCTION(DlsTimeoutAction); #endif // QOS_DLS_SUPPORT // #endif // CONFIG_STA_SUPPORT // -#undef AP_WSC_INCLUDED -#undef STA_WSC_INCLUDED -#undef WSC_INCLUDED - - -#ifdef CONFIG_STA_SUPPORT -#endif // CONFIG_STA_SUPPORT // - -#if defined(AP_WSC_INCLUDED) || defined(STA_WSC_INCLUDED) -#define WSC_INCLUDED -#endif - - - void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time); diff --git a/drivers/staging/rt3070/rtmp.h b/drivers/staging/rt3070/rtmp.h index 51743cbc84bc..54db4a95bcf0 100644 --- a/drivers/staging/rt3070/rtmp.h +++ b/drivers/staging/rt3070/rtmp.h @@ -51,22 +51,6 @@ #include "aironet.h" #endif // CONFIG_STA_SUPPORT // -#undef AP_WSC_INCLUDED -#undef STA_WSC_INCLUDED -#undef WSC_INCLUDED - - -#ifdef CONFIG_STA_SUPPORT -#endif // CONFIG_STA_SUPPORT // - -#if defined(AP_WSC_INCLUDED) || defined(STA_WSC_INCLUDED) -#define WSC_INCLUDED -#endif - - - - - //#define DBG 1 //#define DBG_DIAGNOSE 1 diff --git a/drivers/staging/rt3070/rtmp_def.h b/drivers/staging/rt3070/rtmp_def.h index 7baef9bc2b47..ca1e327da389 100644 --- a/drivers/staging/rt3070/rtmp_def.h +++ b/drivers/staging/rt3070/rtmp_def.h @@ -41,17 +41,6 @@ #include "oid.h" -#undef AP_WSC_INCLUDED -#undef STA_WSC_INCLUDED -#undef WSC_INCLUDED - - -#ifdef CONFIG_STA_SUPPORT -#endif // CONFIG_STA_SUPPORT // - -#if defined(AP_WSC_INCLUDED) || defined(STA_WSC_INCLUDED) -#define WSC_INCLUDED -#endif // // Debug information verbosity: lower values indicate higher urgency //