Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c745f55b authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlagn: merge station management functions 



After driver split, no need to separate station management functions
in two files, merge it

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ade4c649

drivers/net/wireless/iwlwifi/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ iwlwifi-objs += iwl-agn-lib.o iwl-agn-calib.o iwl-io.o 
iwlwifi-objs		+= iwl-agn-tt.o iwl-agn-sta.o



iwlwifi-objs		+= iwl-core.o iwl-eeprom.o iwl-power.o

iwlwifi-objs		+= iwl-rx.o iwl-sta.o

iwlwifi-objs		+= iwl-scan.o iwl-led.o

iwlwifi-objs		+= iwl-rx.o iwl-scan.o iwl-led.o

iwlwifi-objs		+= iwl-agn-rxon.o

iwlwifi-objs		+= iwl-5000.o

iwlwifi-objs		+= iwl-6000.o

drivers/net/wireless/iwlwifi/iwl-1000.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include "iwl-dev.h"

#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-sta.h"

#include "iwl-agn.h"

#include "iwl-helpers.h"

#include "iwl-agn-hw.h"

drivers/net/wireless/iwlwifi/iwl-2000.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include "iwl-dev.h"

#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-sta.h"

#include "iwl-agn.h"

#include "iwl-helpers.h"

#include "iwl-agn-hw.h"

drivers/net/wireless/iwlwifi/iwl-5000.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include "iwl-dev.h"

#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-sta.h"

#include "iwl-helpers.h"

#include "iwl-agn.h"

#include "iwl-agn-hw.h"

drivers/net/wireless/iwlwifi/iwl-6000.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include "iwl-dev.h"

#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-sta.h"

#include "iwl-agn.h"

#include "iwl-helpers.h"

#include "iwl-agn-hw.h"