Staging: remove no longer needed rt3070 driver

rt2870 handles now all rt2870/rt3070 chipsets.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 9548ec0f7cd364054cfb45f7d4a611fa222eb079..d08cd8d563171222275b3cca2b640c1fe59ee8cd 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -73,8 +73,6 @@ source "drivers/staging/rt2860/Kconfig"
 
 source "drivers/staging/rt2870/Kconfig"
 
-source "drivers/staging/rt3070/Kconfig"
-
 source "drivers/staging/rt3090/Kconfig"
 
 source "drivers/staging/comedi/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index edd0c0611433ecfef88e1f36c3e68ed1b52c3d9e..9a23438bf7cb03aaf1a0f483bb2f9f6e013b09d3 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_AGNX)            += agnx/
 obj-$(CONFIG_OTUS)             += otus/
 obj-$(CONFIG_RT2860)           += rt2860/
 obj-$(CONFIG_RT2870)           += rt2870/
-obj-$(CONFIG_RT3070)           += rt3070/
 obj-$(CONFIG_RT3090)           += rt3090/
 obj-$(CONFIG_COMEDI)           += comedi/
 obj-$(CONFIG_ASUS_OLED)                += asus_oled/

diff --git a/drivers/staging/rt3070/2870_main_dev.c b/drivers/staging/rt3070/2870_main_dev.c
deleted file mode 100644 (file)
index 32427c0..0000000
--- a/drivers/staging/rt3070/2870_main_dev.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/2870_main_dev.c"

diff --git a/drivers/staging/rt3070/Kconfig b/drivers/staging/rt3070/Kconfig
deleted file mode 100644 (file)
index 652d825..0000000
--- a/drivers/staging/rt3070/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-config RT3070
-       tristate "Ralink 3070 wireless support"
-       depends on USB && X86 && WLAN_80211 && !RT2870
-       ---help---
-         This is an experimental driver for the Ralink 3070 wireless chip.
-

diff --git a/drivers/staging/rt3070/Makefile b/drivers/staging/rt3070/Makefile
deleted file mode 100644 (file)
index df7ac19..0000000
--- a/drivers/staging/rt3070/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-obj-$(CONFIG_RT3070)   += rt3070sta.o
-
-# TODO: all of these should be removed
-EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
-EXTRA_CFLAGS += -DRT2870 -DRT30xx -DRT3070
-EXTRA_CFLAGS += -DDBG
-
-rt3070sta-objs :=              \
-       common/md5.o            \
-       common/mlme.o           \
-       common/rtmp_wep.o       \
-       common/action.o         \
-       common/cmm_data.o       \
-       common/rtmp_init.o      \
-       common/rtmp_tkip.o      \
-       common/cmm_sync.o       \
-       common/eeprom.o         \
-       common/cmm_sanity.o     \
-       common/cmm_info.o       \
-       common/cmm_wpa.o        \
-       common/dfs.o            \
-       common/spectrum.o       \
-       sta/assoc.o             \
-       sta/aironet.o           \
-       sta/auth.o              \
-       sta/auth_rsp.o          \
-       sta/sync.o              \
-       sta/sanity.o            \
-       sta/rtmp_data.o         \
-       sta/connect.o           \
-       sta/wpa.o               \
-       rt_linux.o              \
-       rt_profile.o            \
-       rt_main_dev.o           \
-       sta_ioctl.o             \
-       common/ba_action.o      \
-       2870_main_dev.o         \
-       common/2870_rtmp_init.o \
-       common/rtusb_io.o       \
-       common/rtusb_bulk.o     \
-       common/rtusb_data.o     \
-       common/cmm_data_2870.o
-

diff --git a/drivers/staging/rt3070/action.h b/drivers/staging/rt3070/action.h
deleted file mode 100644 (file)
index 345fa89..0000000
--- a/drivers/staging/rt3070/action.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/common/action.h"

diff --git a/drivers/staging/rt3070/aironet.h b/drivers/staging/rt3070/aironet.h
deleted file mode 100644 (file)
index 78088f2..0000000
--- a/drivers/staging/rt3070/aironet.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/aironet.h"

diff --git a/drivers/staging/rt3070/ap.h b/drivers/staging/rt3070/ap.h
deleted file mode 100644 (file)
index ab8de4b..0000000
--- a/drivers/staging/rt3070/ap.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/ap.h"

diff --git a/drivers/staging/rt3070/chlist.h b/drivers/staging/rt3070/chlist.h
deleted file mode 100644 (file)
index 8ee1ff5..0000000
--- a/drivers/staging/rt3070/chlist.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/chlist.h"

diff --git a/drivers/staging/rt3070/common/2870_rtmp_init.c b/drivers/staging/rt3070/common/2870_rtmp_init.c
deleted file mode 100644 (file)
index 5456454..0000000
--- a/drivers/staging/rt3070/common/2870_rtmp_init.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/2870_rtmp_init.c"

diff --git a/drivers/staging/rt3070/common/action.c b/drivers/staging/rt3070/common/action.c
deleted file mode 100644 (file)
index 035fd80..0000000
--- a/drivers/staging/rt3070/common/action.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/action.c"

diff --git a/drivers/staging/rt3070/common/ba_action.c b/drivers/staging/rt3070/common/ba_action.c
deleted file mode 100644 (file)
index 2d638ea..0000000
--- a/drivers/staging/rt3070/common/ba_action.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/ba_action.c"

diff --git a/drivers/staging/rt3070/common/cmm_data.c b/drivers/staging/rt3070/common/cmm_data.c
deleted file mode 100644 (file)
index 02e202d..0000000
--- a/drivers/staging/rt3070/common/cmm_data.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/cmm_data.c"

diff --git a/drivers/staging/rt3070/common/cmm_data_2870.c b/drivers/staging/rt3070/common/cmm_data_2870.c
deleted file mode 100644 (file)
index 0e51ee4..0000000
--- a/drivers/staging/rt3070/common/cmm_data_2870.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/cmm_data_2870.c"

diff --git a/drivers/staging/rt3070/common/cmm_info.c b/drivers/staging/rt3070/common/cmm_info.c
deleted file mode 100644 (file)
index 6e981e5..0000000
--- a/drivers/staging/rt3070/common/cmm_info.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/cmm_info.c"

diff --git a/drivers/staging/rt3070/common/cmm_sanity.c b/drivers/staging/rt3070/common/cmm_sanity.c
deleted file mode 100644 (file)
index 82ccf9e..0000000
--- a/drivers/staging/rt3070/common/cmm_sanity.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/cmm_sanity.c"

diff --git a/drivers/staging/rt3070/common/cmm_sync.c b/drivers/staging/rt3070/common/cmm_sync.c
deleted file mode 100644 (file)
index 3b51742..0000000
--- a/drivers/staging/rt3070/common/cmm_sync.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/cmm_sync.c"

diff --git a/drivers/staging/rt3070/common/cmm_wpa.c b/drivers/staging/rt3070/common/cmm_wpa.c
deleted file mode 100644 (file)
index 6483d32..0000000
--- a/drivers/staging/rt3070/common/cmm_wpa.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/cmm_wpa.c"

diff --git a/drivers/staging/rt3070/common/dfs.c b/drivers/staging/rt3070/common/dfs.c
deleted file mode 100644 (file)
index c584a69..0000000
--- a/drivers/staging/rt3070/common/dfs.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/dfs.c"

diff --git a/drivers/staging/rt3070/common/eeprom.c b/drivers/staging/rt3070/common/eeprom.c
deleted file mode 100644 (file)
index 0c567d3..0000000
--- a/drivers/staging/rt3070/common/eeprom.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/eeprom.c"

diff --git a/drivers/staging/rt3070/common/md5.c b/drivers/staging/rt3070/common/md5.c
deleted file mode 100644 (file)
index 0752884..0000000
--- a/drivers/staging/rt3070/common/md5.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/md5.c"

diff --git a/drivers/staging/rt3070/common/mlme.c b/drivers/staging/rt3070/common/mlme.c
deleted file mode 100644 (file)
index c2d0d4e..0000000
--- a/drivers/staging/rt3070/common/mlme.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/mlme.c"

diff --git a/drivers/staging/rt3070/common/rtmp_init.c b/drivers/staging/rt3070/common/rtmp_init.c
deleted file mode 100644 (file)
index 4709e5f..0000000
--- a/drivers/staging/rt3070/common/rtmp_init.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/rtmp_init.c"

diff --git a/drivers/staging/rt3070/common/rtmp_tkip.c b/drivers/staging/rt3070/common/rtmp_tkip.c
deleted file mode 100644 (file)
index 57a5ee9..0000000
--- a/drivers/staging/rt3070/common/rtmp_tkip.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/rtmp_tkip.c"

diff --git a/drivers/staging/rt3070/common/rtmp_wep.c b/drivers/staging/rt3070/common/rtmp_wep.c
deleted file mode 100644 (file)
index 7197985..0000000
--- a/drivers/staging/rt3070/common/rtmp_wep.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/rtmp_wep.c"

diff --git a/drivers/staging/rt3070/common/rtusb_bulk.c b/drivers/staging/rt3070/common/rtusb_bulk.c
deleted file mode 100644 (file)
index 762ecfe..0000000
--- a/drivers/staging/rt3070/common/rtusb_bulk.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/rtusb_bulk.c"

diff --git a/drivers/staging/rt3070/common/rtusb_data.c b/drivers/staging/rt3070/common/rtusb_data.c
deleted file mode 100644 (file)
index d05deb8..0000000
--- a/drivers/staging/rt3070/common/rtusb_data.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/rtusb_data.c"

diff --git a/drivers/staging/rt3070/common/rtusb_io.c b/drivers/staging/rt3070/common/rtusb_io.c
deleted file mode 100644 (file)
index 20a0b56..0000000
--- a/drivers/staging/rt3070/common/rtusb_io.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/rtusb_io.c"

diff --git a/drivers/staging/rt3070/common/spectrum.c b/drivers/staging/rt3070/common/spectrum.c
deleted file mode 100644 (file)
index de3b949..0000000
--- a/drivers/staging/rt3070/common/spectrum.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/common/spectrum.c"

diff --git a/drivers/staging/rt3070/dfs.h b/drivers/staging/rt3070/dfs.h
deleted file mode 100644 (file)
index b9c92e3..0000000
--- a/drivers/staging/rt3070/dfs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/dfs.h"

diff --git a/drivers/staging/rt3070/md5.h b/drivers/staging/rt3070/md5.h
deleted file mode 100644 (file)
index 1042a99..0000000
--- a/drivers/staging/rt3070/md5.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/md5.h"

diff --git a/drivers/staging/rt3070/mlme.h b/drivers/staging/rt3070/mlme.h
deleted file mode 100644 (file)
index 773c0ed..0000000
--- a/drivers/staging/rt3070/mlme.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/mlme.h"

diff --git a/drivers/staging/rt3070/oid.h b/drivers/staging/rt3070/oid.h
deleted file mode 100644 (file)
index cbf16a8..0000000
--- a/drivers/staging/rt3070/oid.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/oid.h"

diff --git a/drivers/staging/rt3070/rt2870.h b/drivers/staging/rt3070/rt2870.h
deleted file mode 100644 (file)
index 16d8717..0000000
--- a/drivers/staging/rt3070/rt2870.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/rt2870.h"

diff --git a/drivers/staging/rt3070/rt28xx.h b/drivers/staging/rt3070/rt28xx.h
deleted file mode 100644 (file)
index c47ddc8..0000000
--- a/drivers/staging/rt3070/rt28xx.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/rt28xx.h"

diff --git a/drivers/staging/rt3070/rt_config.h b/drivers/staging/rt3070/rt_config.h
deleted file mode 100644 (file)
index 3e8fcbd..0000000
--- a/drivers/staging/rt3070/rt_config.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/rt_config.h"

diff --git a/drivers/staging/rt3070/rt_linux.c b/drivers/staging/rt3070/rt_linux.c
deleted file mode 100644 (file)
index 6185f2e..0000000
--- a/drivers/staging/rt3070/rt_linux.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/rt_linux.c"

diff --git a/drivers/staging/rt3070/rt_linux.h b/drivers/staging/rt3070/rt_linux.h
deleted file mode 100644 (file)
index 9f7efee..0000000
--- a/drivers/staging/rt3070/rt_linux.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/rt_linux.h"

diff --git a/drivers/staging/rt3070/rt_main_dev.c b/drivers/staging/rt3070/rt_main_dev.c
deleted file mode 100644 (file)
index c8bcd40..0000000
--- a/drivers/staging/rt3070/rt_main_dev.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/rt_main_dev.c"

diff --git a/drivers/staging/rt3070/rt_profile.c b/drivers/staging/rt3070/rt_profile.c
deleted file mode 100644 (file)
index ab9eb1d..0000000
--- a/drivers/staging/rt3070/rt_profile.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/rt_profile.c"

diff --git a/drivers/staging/rt3070/rtmp.h b/drivers/staging/rt3070/rtmp.h
deleted file mode 100644 (file)
index 5390ca3..0000000
--- a/drivers/staging/rt3070/rtmp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/rtmp.h"

diff --git a/drivers/staging/rt3070/rtmp_ckipmic.h b/drivers/staging/rt3070/rtmp_ckipmic.h
deleted file mode 100644 (file)
index 4956093..0000000
--- a/drivers/staging/rt3070/rtmp_ckipmic.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/rtmp_ckipmic.h"

diff --git a/drivers/staging/rt3070/rtmp_def.h b/drivers/staging/rt3070/rtmp_def.h
deleted file mode 100644 (file)
index fa3b6b5..0000000
--- a/drivers/staging/rt3070/rtmp_def.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/rtmp_def.h"

diff --git a/drivers/staging/rt3070/rtmp_type.h b/drivers/staging/rt3070/rtmp_type.h
deleted file mode 100644 (file)
index 42384e5..0000000
--- a/drivers/staging/rt3070/rtmp_type.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/rtmp_type.h"

diff --git a/drivers/staging/rt3070/spectrum.h b/drivers/staging/rt3070/spectrum.h
deleted file mode 100644 (file)
index 1ca9c25..0000000
--- a/drivers/staging/rt3070/spectrum.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/spectrum.h"

diff --git a/drivers/staging/rt3070/spectrum_def.h b/drivers/staging/rt3070/spectrum_def.h
deleted file mode 100644 (file)
index 892bc88..0000000
--- a/drivers/staging/rt3070/spectrum_def.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/spectrum_def.h"

diff --git a/drivers/staging/rt3070/sta/aironet.c b/drivers/staging/rt3070/sta/aironet.c
deleted file mode 100644 (file)
index 48fcc46..0000000
--- a/drivers/staging/rt3070/sta/aironet.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/sta/aironet.c"

diff --git a/drivers/staging/rt3070/sta/assoc.c b/drivers/staging/rt3070/sta/assoc.c
deleted file mode 100644 (file)
index 1987a2a..0000000
--- a/drivers/staging/rt3070/sta/assoc.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/sta/assoc.c"

diff --git a/drivers/staging/rt3070/sta/auth.c b/drivers/staging/rt3070/sta/auth.c
deleted file mode 100644 (file)
index d551982..0000000
--- a/drivers/staging/rt3070/sta/auth.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/sta/auth.c"

diff --git a/drivers/staging/rt3070/sta/auth_rsp.c b/drivers/staging/rt3070/sta/auth_rsp.c
deleted file mode 100644 (file)
index c4ea2dc..0000000
--- a/drivers/staging/rt3070/sta/auth_rsp.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/sta/auth_rsp.c"

diff --git a/drivers/staging/rt3070/sta/connect.c b/drivers/staging/rt3070/sta/connect.c
deleted file mode 100644 (file)
index d77802c..0000000
--- a/drivers/staging/rt3070/sta/connect.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "../../rt2870/sta/connect.c"
-

diff --git a/drivers/staging/rt3070/sta/rtmp_data.c b/drivers/staging/rt3070/sta/rtmp_data.c
deleted file mode 100644 (file)
index bf09120..0000000
--- a/drivers/staging/rt3070/sta/rtmp_data.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/sta/rtmp_data.c"

diff --git a/drivers/staging/rt3070/sta/sanity.c b/drivers/staging/rt3070/sta/sanity.c
deleted file mode 100644 (file)
index b495477..0000000
--- a/drivers/staging/rt3070/sta/sanity.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/sta/sanity.c"

diff --git a/drivers/staging/rt3070/sta/sync.c b/drivers/staging/rt3070/sta/sync.c
deleted file mode 100644 (file)
index b7b8eb4..0000000
--- a/drivers/staging/rt3070/sta/sync.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/sta/sync.c"

diff --git a/drivers/staging/rt3070/sta/wpa.c b/drivers/staging/rt3070/sta/wpa.c
deleted file mode 100644 (file)
index 95543bb..0000000
--- a/drivers/staging/rt3070/sta/wpa.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../rt2870/sta/wpa.c"

diff --git a/drivers/staging/rt3070/sta_ioctl.c b/drivers/staging/rt3070/sta_ioctl.c
deleted file mode 100644 (file)
index ac56507..0000000
--- a/drivers/staging/rt3070/sta_ioctl.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/sta_ioctl.c"

diff --git a/drivers/staging/rt3070/wpa.h b/drivers/staging/rt3070/wpa.h
deleted file mode 100644 (file)
index 94bb232..0000000
--- a/drivers/staging/rt3070/wpa.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/wpa.h"