spectra: Move to drivers/staging

It'll take some work before this is really shippable.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

24 files changed, 3 insertions, 4 deletions

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index d62b95d2ab00..77bfce52e9ca 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -488,6 +488,4 @@ config BLK_DEV_HD
 
 	  If unsure, say N.
 
-source "drivers/block/spectra/Kconfig"
-
 endif # BLK_DEV
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 568ba651cb5e..aff5ac925c34 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -38,6 +38,4 @@ obj-$(CONFIG_BLK_DEV_HD)	+= hd.o
 obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o
 obj-$(CONFIG_BLK_DEV_DRBD)     += drbd/
 
-obj-$(CONFIG_MRST_NAND)	+= spectra/
-
 swim_mod-objs	:= swim.o swim_asm.o
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 7696a664f8a5..79cf5f720952 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -97,6 +97,8 @@ source "drivers/staging/octeon/Kconfig"
 
 source "drivers/staging/serqt_usb2/Kconfig"
 
+source "drivers/staging/spectra/Kconfig"
+
 source "drivers/staging/quatech_usb2/Kconfig"
 
 source "drivers/staging/vt6655/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index ea2e70e2fed4..401049ef01d1 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_R8187SE)		+= rtl8187se/
 obj-$(CONFIG_RTL8192SU)		+= rtl8192su/
 obj-$(CONFIG_RTL8192U)		+= rtl8192u/
 obj-$(CONFIG_RTL8192E)		+= rtl8192e/
+obj-$(CONFIG_MRST_NAND)		+= spectra/
 obj-$(CONFIG_TRANZPORT)		+= frontier/
 obj-$(CONFIG_DREAM)		+= dream/
 obj-$(CONFIG_POHMELFS)		+= pohmelfs/
diff --git a/drivers/block/spectra/Kconfig b/drivers/staging/spectra/Kconfig
index 4bed96f68837..4bed96f68837 100644
--- a/drivers/block/spectra/Kconfig
+++ b/drivers/staging/spectra/Kconfig
diff --git a/drivers/block/spectra/Makefile b/drivers/staging/spectra/Makefile
index 2a9490385339..2a9490385339 100644
--- a/drivers/block/spectra/Makefile
+++ b/drivers/staging/spectra/Makefile
diff --git a/drivers/block/spectra/README b/drivers/staging/spectra/README
index ecba559b899c..ecba559b899c 100644
--- a/drivers/block/spectra/README
+++ b/drivers/staging/spectra/README
diff --git a/drivers/block/spectra/ffsdefs.h b/drivers/staging/spectra/ffsdefs.h
index a9e9cd233d2a..a9e9cd233d2a 100644
--- a/drivers/block/spectra/ffsdefs.h
+++ b/drivers/staging/spectra/ffsdefs.h
diff --git a/drivers/block/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c
index 3c3565d40545..3c3565d40545 100644
--- a/drivers/block/spectra/ffsport.c
+++ b/drivers/staging/spectra/ffsport.c
diff --git a/drivers/block/spectra/ffsport.h b/drivers/staging/spectra/ffsport.h
index 6c5d90c53430..6c5d90c53430 100644
--- a/drivers/block/spectra/ffsport.h
+++ b/drivers/staging/spectra/ffsport.h
diff --git a/drivers/block/spectra/flash.c b/drivers/staging/spectra/flash.c
index 134aa5166a8d..134aa5166a8d 100644
--- a/drivers/block/spectra/flash.c
+++ b/drivers/staging/spectra/flash.c
diff --git a/drivers/block/spectra/flash.h b/drivers/staging/spectra/flash.h
index 5ed05805cf65..5ed05805cf65 100644
--- a/drivers/block/spectra/flash.h
+++ b/drivers/staging/spectra/flash.h
diff --git a/drivers/block/spectra/lld.c b/drivers/staging/spectra/lld.c
index 5c3b9762dc3e..5c3b9762dc3e 100644
--- a/drivers/block/spectra/lld.c
+++ b/drivers/staging/spectra/lld.c
diff --git a/drivers/block/spectra/lld.h b/drivers/staging/spectra/lld.h
index d3738e0e1fea..d3738e0e1fea 100644
--- a/drivers/block/spectra/lld.h
+++ b/drivers/staging/spectra/lld.h
diff --git a/drivers/block/spectra/lld_cdma.c b/drivers/staging/spectra/lld_cdma.c
index c6e76103d43c..c6e76103d43c 100644
--- a/drivers/block/spectra/lld_cdma.c
+++ b/drivers/staging/spectra/lld_cdma.c
diff --git a/drivers/block/spectra/lld_cdma.h b/drivers/staging/spectra/lld_cdma.h
index 854ea066f0c4..854ea066f0c4 100644
--- a/drivers/block/spectra/lld_cdma.h
+++ b/drivers/staging/spectra/lld_cdma.h
diff --git a/drivers/block/spectra/lld_emu.c b/drivers/staging/spectra/lld_emu.c
index 60eb0f6fdba4..60eb0f6fdba4 100644
--- a/drivers/block/spectra/lld_emu.c
+++ b/drivers/staging/spectra/lld_emu.c
diff --git a/drivers/block/spectra/lld_emu.h b/drivers/staging/spectra/lld_emu.h
index 63f84c38d3c1..63f84c38d3c1 100644
--- a/drivers/block/spectra/lld_emu.h
+++ b/drivers/staging/spectra/lld_emu.h
diff --git a/drivers/block/spectra/lld_mtd.c b/drivers/staging/spectra/lld_mtd.c
index 0de05b1e75f7..0de05b1e75f7 100644
--- a/drivers/block/spectra/lld_mtd.c
+++ b/drivers/staging/spectra/lld_mtd.c
diff --git a/drivers/block/spectra/lld_mtd.h b/drivers/staging/spectra/lld_mtd.h
index 4e81ee87b53d..4e81ee87b53d 100644
--- a/drivers/block/spectra/lld_mtd.h
+++ b/drivers/staging/spectra/lld_mtd.h
diff --git a/drivers/block/spectra/lld_nand.c b/drivers/staging/spectra/lld_nand.c
index 13c3ad2db394..13c3ad2db394 100644
--- a/drivers/block/spectra/lld_nand.c
+++ b/drivers/staging/spectra/lld_nand.c
diff --git a/drivers/block/spectra/lld_nand.h b/drivers/staging/spectra/lld_nand.h
index d08388287da8..d08388287da8 100644
--- a/drivers/block/spectra/lld_nand.h
+++ b/drivers/staging/spectra/lld_nand.h
diff --git a/drivers/block/spectra/nand_regs.h b/drivers/staging/spectra/nand_regs.h
index e192e4ae8c1e..e192e4ae8c1e 100644
--- a/drivers/block/spectra/nand_regs.h
+++ b/drivers/staging/spectra/nand_regs.h
diff --git a/drivers/block/spectra/spectraswconfig.h b/drivers/staging/spectra/spectraswconfig.h
index 557c091953d7..557c091953d7 100644
--- a/drivers/block/spectra/spectraswconfig.h
+++ b/drivers/staging/spectra/spectraswconfig.h