spectra: Rename config options

This is the Spectra driver, so use CONFIG_SPECTRA.

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

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 401049ef01d1d83144cd455d4c76bb7e0c54f73d..2e2f96ee2c80ade5e781a9acaeaea003451c4bdf 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -22,7 +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_SPECTRA)          += spectra/
 obj-$(CONFIG_TRANZPORT)                += frontier/
 obj-$(CONFIG_DREAM)            += dream/
 obj-$(CONFIG_POHMELFS)         += pohmelfs/

diff --git a/drivers/staging/spectra/Kconfig b/drivers/staging/spectra/Kconfig
index 4bed96f688379122a275f4571ae1910e1054b84d..5e2ffefb60af9c86c384eff40baaaacca3a279f1 100644 (file)
--- a/drivers/staging/spectra/Kconfig
+++ b/drivers/staging/spectra/Kconfig
@@ -1,40 +1,40 @@
 
-menuconfig MRST_NAND
-       tristate "Moorestown NAND Flash controller"
+menuconfig SPECTRA
+       tristate "Denali Spectra Flash Translation Layer"
        depends on BLOCK
        default n
        ---help---
-         Enable the driver for the NAND Flash controller in Intel Moorestown
-         Platform
+         Enable the FTL pseudo-filesystem used with the NAND Flash
+         controller on Intel Moorestown Platform to pretend to be a disk
 
 choice
        prompt "Compile for"
-       depends on MRST_NAND
-       default MRST_NAND_HW
+       depends on SPECTRA
+       default SPECTRA_MRST_HW
 
-config MRST_NAND_HW
-       bool "Actual hardware mode"
+config SPECTRA_MRST_HW
+       bool "Moorestown hardware mode"
        help
-         Driver communicates with the actual hardware's register interface.
+         Driver communicates with the Moorestown hardware's register interface.
          in DMA mode.
 
-config MRST_NAND_MTD
+config SPECTRA_MTD
        bool "Linux MTD mode"
        depends on MTD
        help
          Driver communicates with the kernel MTD subsystem instead of its own
          built-in hardware driver.
 
-config MRST_NAND_EMU
+config SPECTRA_EMU
        bool "RAM emulator testing"
        help
          Driver emulates Flash on a RAM buffer and / or disk file.  Useful to test the behavior of FTL layer.
 
 endchoice
 
-config MRST_NAND_HW_DMA
+config SPECTRA_MRST_HW_DMA
        bool
        default n
-       depends on MRST_NAND_HW
+       depends on SPECTRA_MRST_HW
        help
          Use DMA for native hardware interface.

diff --git a/drivers/staging/spectra/Makefile b/drivers/staging/spectra/Makefile
index 2a9490385339dc202985e264225112338f937f46..f777dfba05a55f693c385dc345d45d2f7663c33d 100644 (file)
--- a/drivers/staging/spectra/Makefile
+++ b/drivers/staging/spectra/Makefile
@@ -2,10 +2,10 @@
 # Makefile of Intel Moorestown NAND controller driver
 #
 
-obj-$(CONFIG_MRST_NAND) += spectra.o
+obj-$(CONFIG_SPECTRA) += spectra.o
 spectra-y := ffsport.o flash.o lld.o
-spectra-$(CONFIG_MRST_NAND_HW) += lld_nand.o 
-spectra-$(CONFIG_MRST_NAND_HW_DMA) += lld_cdma.o
-spectra-$(CONFIG_MRST_NAND_EMU) += lld_emu.o
-spectra-$(CONFIG_MRST_NAND_MTD) += lld_mtd.o
+spectra-$(CONFIG_SPECTRA_MRST_HW) += lld_nand.o 
+spectra-$(CONFIG_SPECTRA_MRST_HW_DMA) += lld_cdma.o
+spectra-$(CONFIG_SPECTRA_EMU) += lld_emu.o
+spectra-$(CONFIG_SPECTRA_MTD) += lld_mtd.o
 

diff --git a/drivers/staging/spectra/spectraswconfig.h b/drivers/staging/spectra/spectraswconfig.h
index 557c091953d7f59fe2aaa18a4bf8cb7979aff8be..17259469e95518166302b894606aa8188d2826b9 100644 (file)
--- a/drivers/staging/spectra/spectraswconfig.h
+++ b/drivers/staging/spectra/spectraswconfig.h
@@ -45,10 +45,10 @@
 #define DEBUG_BNDRY             0
 
 /***** Product Feature Support *****/
-#define FLASH_EMU               defined(CONFIG_MRST_NAND_EMU)
-#define FLASH_NAND              defined(CONFIG_MRST_NAND_HW)
-#define FLASH_MTD               defined(CONFIG_MRST_NAND_MTD)
-#define CMD_DMA                 defined(CONFIG_MRST_NAND_HW_DMA)
+#define FLASH_EMU               defined(CONFIG_SPECTRA_EMU)
+#define FLASH_NAND              defined(CONFIG_SPECTRA_MRST_HW)
+#define FLASH_MTD               defined(CONFIG_SPECTRA_MTD)
+#define CMD_DMA                 defined(CONFIG_SPECTRA_MRST_HW_DMA)
 
 #define SPECTRA_PARTITION_ID    0