iwlegacy: merge iwl-4965-lib.c into 4965-mac.c

Signed-off-by: N Stanislaw Gruszka <sgruszka@redhat.com>

iwlegacy: merge iwl-4965-lib.c into 4965-mac.c
Signed-off-by: N Stanislaw Gruszka <sgruszka@redhat.com>
fcb74588 · Stanislaw Gruszka · a1751b22 · fcb74588 · fcb74588 · a1751b22
3 changed file
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
--- a/drivers/net/wireless/iwlegacy/Makefile
+++ b/drivers/net/wireless/iwlegacy/Makefile
@@ -9,7 +9,7 @@ iwl-legacy-objs += $(iwl-legacy-m)
 # 4965
 obj-$(CONFIG_IWL4965)	+= iwl4965.o
 iwl4965-objs		:= 4965.o 4965-mac.o iwl-4965-rs.o
-iwl4965-objs		+= iwl-4965-lib.o iwl-4965-calib.o
+iwl4965-objs		+= iwl-4965-calib.o
 iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-4965-debugfs.o

 # 3945

--- a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c