From: David Woodhouse <David.Woodhouse@xxxxxxxxx>
It'll take some work before this is really shippable.
Signed-off-by: David Woodhouse <David.Woodhouse@xxxxxxxxx>
---
drivers/block/Kconfig | 2 --
drivers/block/Makefile | 2 --
drivers/staging/Kconfig | 2 ++
drivers/staging/Makefile | 1 +
drivers/{block => staging}/spectra/Kconfig | 0
drivers/{block => staging}/spectra/Makefile | 0
drivers/{block => staging}/spectra/README | 0
drivers/{block => staging}/spectra/ffsdefs.h | 0
drivers/{block => staging}/spectra/ffsport.c | 0
drivers/{block => staging}/spectra/ffsport.h | 0
drivers/{block => staging}/spectra/flash.c | 0
drivers/{block => staging}/spectra/flash.h | 0
drivers/{block => staging}/spectra/lld.c | 0
drivers/{block => staging}/spectra/lld.h | 0
drivers/{block => staging}/spectra/lld_cdma.c | 0
drivers/{block => staging}/spectra/lld_cdma.h | 0
drivers/{block => staging}/spectra/lld_emu.c | 0
drivers/{block => staging}/spectra/lld_emu.h | 0
drivers/{block => staging}/spectra/lld_mtd.c | 0
drivers/{block => staging}/spectra/lld_mtd.h | 0
drivers/{block => staging}/spectra/lld_nand.c | 0
drivers/{block => staging}/spectra/lld_nand.h | 0
drivers/{block => staging}/spectra/nand_regs.h | 0
.../{block => staging}/spectra/spectraswconfig.h | 0
24 files changed, 3 insertions(+), 4 deletions(-)
rename drivers/{block => staging}/spectra/Kconfig (100%)
rename drivers/{block => staging}/spectra/Makefile (100%)
rename drivers/{block => staging}/spectra/README (100%)
rename drivers/{block => staging}/spectra/ffsdefs.h (100%)
rename drivers/{block => staging}/spectra/ffsport.c (100%)
rename drivers/{block => staging}/spectra/ffsport.h (100%)
rename drivers/{block => staging}/spectra/flash.c (100%)
rename drivers/{block => staging}/spectra/flash.h (100%)
rename drivers/{block => staging}/spectra/lld.c (100%)
rename drivers/{block => staging}/spectra/lld.h (100%)
rename drivers/{block => staging}/spectra/lld_cdma.c (100%)
rename drivers/{block => staging}/spectra/lld_cdma.h (100%)
rename drivers/{block => staging}/spectra/lld_emu.c (100%)
rename drivers/{block => staging}/spectra/lld_emu.h (100%)
rename drivers/{block => staging}/spectra/lld_mtd.c (100%)
rename drivers/{block => staging}/spectra/lld_mtd.h (100%)
rename drivers/{block => staging}/spectra/lld_nand.c (100%)
rename drivers/{block => staging}/spectra/lld_nand.h (100%)
rename drivers/{block => staging}/spectra/nand_regs.h (100%)
rename drivers/{block => staging}/spectra/spectraswconfig.h (100%)
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index d62b95d..77bfce5 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 568ba65..aff5ac9 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 7696a66..79cf5f7 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 ea2e70e..401049e 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
similarity index 100%
rename from drivers/block/spectra/Kconfig
rename to drivers/staging/spectra/Kconfig
diff --git a/drivers/block/spectra/Makefile b/drivers/staging/spectra/Makefile
similarity index 100%
rename from drivers/block/spectra/Makefile
rename to drivers/staging/spectra/Makefile
diff --git a/drivers/block/spectra/README b/drivers/staging/spectra/README
similarity index 100%
rename from drivers/block/spectra/README
rename to drivers/staging/spectra/README
diff --git a/drivers/block/spectra/ffsdefs.h b/drivers/staging/spectra/ffsdefs.h
similarity index 100%
rename from drivers/block/spectra/ffsdefs.h
rename to drivers/staging/spectra/ffsdefs.h
diff --git a/drivers/block/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c
similarity index 100%
rename from drivers/block/spectra/ffsport.c
rename to drivers/staging/spectra/ffsport.c
diff --git a/drivers/block/spectra/ffsport.h b/drivers/staging/spectra/ffsport.h
similarity index 100%
rename from drivers/block/spectra/ffsport.h
rename to drivers/staging/spectra/ffsport.h
diff --git a/drivers/block/spectra/flash.c b/drivers/staging/spectra/flash.c
similarity index 100%
rename from drivers/block/spectra/flash.c
rename to drivers/staging/spectra/flash.c
diff --git a/drivers/block/spectra/flash.h b/drivers/staging/spectra/flash.h
similarity index 100%
rename from drivers/block/spectra/flash.h
rename to drivers/staging/spectra/flash.h
diff --git a/drivers/block/spectra/lld.c b/drivers/staging/spectra/lld.c
similarity index 100%
rename from drivers/block/spectra/lld.c
rename to drivers/staging/spectra/lld.c
diff --git a/drivers/block/spectra/lld.h b/drivers/staging/spectra/lld.h
similarity index 100%
rename from drivers/block/spectra/lld.h
rename to drivers/staging/spectra/lld.h
diff --git a/drivers/block/spectra/lld_cdma.c b/drivers/staging/spectra/lld_cdma.c
similarity index 100%
rename from drivers/block/spectra/lld_cdma.c
rename to drivers/staging/spectra/lld_cdma.c
diff --git a/drivers/block/spectra/lld_cdma.h b/drivers/staging/spectra/lld_cdma.h
similarity index 100%
rename from drivers/block/spectra/lld_cdma.h
rename to drivers/staging/spectra/lld_cdma.h
diff --git a/drivers/block/spectra/lld_emu.c b/drivers/staging/spectra/lld_emu.c
similarity index 100%
rename from drivers/block/spectra/lld_emu.c
rename to drivers/staging/spectra/lld_emu.c
diff --git a/drivers/block/spectra/lld_emu.h b/drivers/staging/spectra/lld_emu.h
similarity index 100%
rename from drivers/block/spectra/lld_emu.h
rename to drivers/staging/spectra/lld_emu.h
diff --git a/drivers/block/spectra/lld_mtd.c b/drivers/staging/spectra/lld_mtd.c
similarity index 100%
rename from drivers/block/spectra/lld_mtd.c
rename to drivers/staging/spectra/lld_mtd.c
diff --git a/drivers/block/spectra/lld_mtd.h b/drivers/staging/spectra/lld_mtd.h
similarity index 100%
rename from drivers/block/spectra/lld_mtd.h
rename to drivers/staging/spectra/lld_mtd.h
diff --git a/drivers/block/spectra/lld_nand.c b/drivers/staging/spectra/lld_nand.c
similarity index 100%
rename from drivers/block/spectra/lld_nand.c
rename to drivers/staging/spectra/lld_nand.c
diff --git a/drivers/block/spectra/lld_nand.h b/drivers/staging/spectra/lld_nand.h
similarity index 100%
rename from drivers/block/spectra/lld_nand.h
rename to drivers/staging/spectra/lld_nand.h
diff --git a/drivers/block/spectra/nand_regs.h b/drivers/staging/spectra/nand_regs.h
similarity index 100%
rename from drivers/block/spectra/nand_regs.h
rename to drivers/staging/spectra/nand_regs.h
diff --git a/drivers/block/spectra/spectraswconfig.h b/drivers/staging/spectra/spectraswconfig.h
similarity index 100%
rename from drivers/block/spectra/spectraswconfig.h
rename to drivers/staging/spectra/spectraswconfig.h
--
1.7.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
