From 49debb5684009d56ec5a0f930e513b1044db5e76 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sun, 23 Aug 2009 15:32:20 +0200
Subject: 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>
---
 drivers/staging/Kconfig                        |  2 --
 drivers/staging/Makefile                       |  1 -
 drivers/staging/rt3070/2870_main_dev.c         |  1 -
 drivers/staging/rt3070/Kconfig                 |  6 ----
 drivers/staging/rt3070/Makefile                | 43 --------------------------
 drivers/staging/rt3070/action.h                |  1 -
 drivers/staging/rt3070/aironet.h               |  1 -
 drivers/staging/rt3070/ap.h                    |  1 -
 drivers/staging/rt3070/chlist.h                |  1 -
 drivers/staging/rt3070/common/2870_rtmp_init.c |  1 -
 drivers/staging/rt3070/common/action.c         |  1 -
 drivers/staging/rt3070/common/ba_action.c      |  1 -
 drivers/staging/rt3070/common/cmm_data.c       |  1 -
 drivers/staging/rt3070/common/cmm_data_2870.c  |  1 -
 drivers/staging/rt3070/common/cmm_info.c       |  1 -
 drivers/staging/rt3070/common/cmm_sanity.c     |  1 -
 drivers/staging/rt3070/common/cmm_sync.c       |  1 -
 drivers/staging/rt3070/common/cmm_wpa.c        |  1 -
 drivers/staging/rt3070/common/dfs.c            |  1 -
 drivers/staging/rt3070/common/eeprom.c         |  1 -
 drivers/staging/rt3070/common/md5.c            |  1 -
 drivers/staging/rt3070/common/mlme.c           |  1 -
 drivers/staging/rt3070/common/rtmp_init.c      |  1 -
 drivers/staging/rt3070/common/rtmp_tkip.c      |  1 -
 drivers/staging/rt3070/common/rtmp_wep.c       |  1 -
 drivers/staging/rt3070/common/rtusb_bulk.c     |  1 -
 drivers/staging/rt3070/common/rtusb_data.c     |  1 -
 drivers/staging/rt3070/common/rtusb_io.c       |  1 -
 drivers/staging/rt3070/common/spectrum.c       |  1 -
 drivers/staging/rt3070/dfs.h                   |  1 -
 drivers/staging/rt3070/md5.h                   |  1 -
 drivers/staging/rt3070/mlme.h                  |  1 -
 drivers/staging/rt3070/oid.h                   |  1 -
 drivers/staging/rt3070/rt2870.h                |  1 -
 drivers/staging/rt3070/rt28xx.h                |  1 -
 drivers/staging/rt3070/rt_config.h             |  1 -
 drivers/staging/rt3070/rt_linux.c              |  1 -
 drivers/staging/rt3070/rt_linux.h              |  1 -
 drivers/staging/rt3070/rt_main_dev.c           |  1 -
 drivers/staging/rt3070/rt_profile.c            |  1 -
 drivers/staging/rt3070/rtmp.h                  |  1 -
 drivers/staging/rt3070/rtmp_ckipmic.h          |  1 -
 drivers/staging/rt3070/rtmp_def.h              |  1 -
 drivers/staging/rt3070/rtmp_type.h             |  1 -
 drivers/staging/rt3070/spectrum.h              |  1 -
 drivers/staging/rt3070/spectrum_def.h          |  1 -
 drivers/staging/rt3070/sta/aironet.c           |  1 -
 drivers/staging/rt3070/sta/assoc.c             |  1 -
 drivers/staging/rt3070/sta/auth.c              |  1 -
 drivers/staging/rt3070/sta/auth_rsp.c          |  1 -
 drivers/staging/rt3070/sta/connect.c           |  2 --
 drivers/staging/rt3070/sta/rtmp_data.c         |  1 -
 drivers/staging/rt3070/sta/sanity.c            |  1 -
 drivers/staging/rt3070/sta/sync.c              |  1 -
 drivers/staging/rt3070/sta/wpa.c               |  1 -
 drivers/staging/rt3070/sta_ioctl.c             |  1 -
 drivers/staging/rt3070/wpa.h                   |  1 -
 57 files changed, 106 deletions(-)
 delete mode 100644 drivers/staging/rt3070/2870_main_dev.c
 delete mode 100644 drivers/staging/rt3070/Kconfig
 delete mode 100644 drivers/staging/rt3070/Makefile
 delete mode 100644 drivers/staging/rt3070/action.h
 delete mode 100644 drivers/staging/rt3070/aironet.h
 delete mode 100644 drivers/staging/rt3070/ap.h
 delete mode 100644 drivers/staging/rt3070/chlist.h
 delete mode 100644 drivers/staging/rt3070/common/2870_rtmp_init.c
 delete mode 100644 drivers/staging/rt3070/common/action.c
 delete mode 100644 drivers/staging/rt3070/common/ba_action.c
 delete mode 100644 drivers/staging/rt3070/common/cmm_data.c
 delete mode 100644 drivers/staging/rt3070/common/cmm_data_2870.c
 delete mode 100644 drivers/staging/rt3070/common/cmm_info.c
 delete mode 100644 drivers/staging/rt3070/common/cmm_sanity.c
 delete mode 100644 drivers/staging/rt3070/common/cmm_sync.c
 delete mode 100644 drivers/staging/rt3070/common/cmm_wpa.c
 delete mode 100644 drivers/staging/rt3070/common/dfs.c
 delete mode 100644 drivers/staging/rt3070/common/eeprom.c
 delete mode 100644 drivers/staging/rt3070/common/md5.c
 delete mode 100644 drivers/staging/rt3070/common/mlme.c
 delete mode 100644 drivers/staging/rt3070/common/rtmp_init.c
 delete mode 100644 drivers/staging/rt3070/common/rtmp_tkip.c
 delete mode 100644 drivers/staging/rt3070/common/rtmp_wep.c
 delete mode 100644 drivers/staging/rt3070/common/rtusb_bulk.c
 delete mode 100644 drivers/staging/rt3070/common/rtusb_data.c
 delete mode 100644 drivers/staging/rt3070/common/rtusb_io.c
 delete mode 100644 drivers/staging/rt3070/common/spectrum.c
 delete mode 100644 drivers/staging/rt3070/dfs.h
 delete mode 100644 drivers/staging/rt3070/md5.h
 delete mode 100644 drivers/staging/rt3070/mlme.h
 delete mode 100644 drivers/staging/rt3070/oid.h
 delete mode 100644 drivers/staging/rt3070/rt2870.h
 delete mode 100644 drivers/staging/rt3070/rt28xx.h
 delete mode 100644 drivers/staging/rt3070/rt_config.h
 delete mode 100644 drivers/staging/rt3070/rt_linux.c
 delete mode 100644 drivers/staging/rt3070/rt_linux.h
 delete mode 100644 drivers/staging/rt3070/rt_main_dev.c
 delete mode 100644 drivers/staging/rt3070/rt_profile.c
 delete mode 100644 drivers/staging/rt3070/rtmp.h
 delete mode 100644 drivers/staging/rt3070/rtmp_ckipmic.h
 delete mode 100644 drivers/staging/rt3070/rtmp_def.h
 delete mode 100644 drivers/staging/rt3070/rtmp_type.h
 delete mode 100644 drivers/staging/rt3070/spectrum.h
 delete mode 100644 drivers/staging/rt3070/spectrum_def.h
 delete mode 100644 drivers/staging/rt3070/sta/aironet.c
 delete mode 100644 drivers/staging/rt3070/sta/assoc.c
 delete mode 100644 drivers/staging/rt3070/sta/auth.c
 delete mode 100644 drivers/staging/rt3070/sta/auth_rsp.c
 delete mode 100644 drivers/staging/rt3070/sta/connect.c
 delete mode 100644 drivers/staging/rt3070/sta/rtmp_data.c
 delete mode 100644 drivers/staging/rt3070/sta/sanity.c
 delete mode 100644 drivers/staging/rt3070/sta/sync.c
 delete mode 100644 drivers/staging/rt3070/sta/wpa.c
 delete mode 100644 drivers/staging/rt3070/sta_ioctl.c
 delete mode 100644 drivers/staging/rt3070/wpa.h

(limited to 'drivers/staging')

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 9548ec0f7cd..d08cd8d5631 100644
--- 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 edd0c061143..9a23438bf7c 100644
--- 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
index 32427c0bb3b..00000000000
--- 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
index 652d825338e..00000000000
--- 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
index df7ac19e088..00000000000
--- 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
index 345fa8922ed..00000000000
--- 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
index 78088f2087e..00000000000
--- 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
index ab8de4bbad0..00000000000
--- 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
index 8ee1ff527f5..00000000000
--- 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
index 5456454b8d3..00000000000
--- 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
index 035fd803f61..00000000000
--- 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
index 2d638ea8c87..00000000000
--- 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
index 02e202db4da..00000000000
--- 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
index 0e51ee414a2..00000000000
--- 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
index 6e981e523fb..00000000000
--- 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
index 82ccf9e85f3..00000000000
--- 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
index 3b517420f48..00000000000
--- 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
index 6483d329286..00000000000
--- 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
index c584a6924c3..00000000000
--- 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
index 0c567d3dad0..00000000000
--- 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
index 07528842267..00000000000
--- 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
index c2d0d4e10cb..00000000000
--- 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
index 4709e5f28a8..00000000000
--- 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
index 57a5ee96f31..00000000000
--- 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
index 71979856e11..00000000000
--- 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
index 762ecfe6044..00000000000
--- 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
index d05deb870f4..00000000000
--- 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
index 20a0b56e58b..00000000000
--- 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
index de3b949e52f..00000000000
--- 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
index b9c92e354f2..00000000000
--- 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
index 1042a994dc7..00000000000
--- 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
index 773c0edfcea..00000000000
--- 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
index cbf16a8ae61..00000000000
--- 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
index 16d8717b9db..00000000000
--- 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
index c47ddc8bd9e..00000000000
--- 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
index 3e8fcbdd579..00000000000
--- 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
index 6185f2e9992..00000000000
--- 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
index 9f7efee3d60..00000000000
--- 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
index c8bcd4029c3..00000000000
--- 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
index ab9eb1d55bb..00000000000
--- 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
index 5390ca3eb27..00000000000
--- 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
index 4956093f475..00000000000
--- 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
index fa3b6b55cfe..00000000000
--- 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
index 42384e50679..00000000000
--- 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
index 1ca9c2584bf..00000000000
--- 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
index 892bc88c65f..00000000000
--- 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
index 48fcc469527..00000000000
--- 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
index 1987a2a4b05..00000000000
--- 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
index d55198288d9..00000000000
--- 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
index c4ea2dc49ad..00000000000
--- 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
index d77802caa30..00000000000
--- 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
index bf091206f5c..00000000000
--- 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
index b4954779b31..00000000000
--- 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
index b7b8eb4f446..00000000000
--- 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
index 95543bb1f0e..00000000000
--- 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
index ac56507e3c8..00000000000
--- 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
index 94bb2327940..00000000000
--- a/drivers/staging/rt3070/wpa.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../rt2870/wpa.h"
-- 
cgit v1.2.3