spi: Move at25 (for SPI eeproms) to /drivers/misc/eeprom

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig
index 3d31b66442454ee223dea66178aa89bc4249d155..5bf3c92d71629aff2806e0648d1a44fc2276e9f8 100644 (file)
--- a/drivers/misc/eeprom/Kconfig
+++ b/drivers/misc/eeprom/Kconfig
@@ -26,6 +26,17 @@ config AT24
          This driver can also be built as a module.  If so, the module
          will be called at24.
 
+config SPI_AT25
+       tristate "SPI EEPROMs from most vendors"
+       depends on SPI && SYSFS
+       help
+         Enable this driver to get read/write support to most SPI EEPROMs,
+         after you configure the board init code to know about each eeprom
+         on your target board.
+
+         This driver can also be built as a module.  If so, the module
+         will be called at25.
+
 config SENSORS_EEPROM
        tristate "Old I2C EEPROM reader"
        depends on I2C && EXPERIMENTAL

diff --git a/drivers/misc/eeprom/Makefile b/drivers/misc/eeprom/Makefile
index a3dad28f2724eff4210d6f6c96f870056af29bdc..a4fb5cf8ffe6a716896e004df860efb221e95b0f 100644 (file)
--- a/drivers/misc/eeprom/Makefile
+++ b/drivers/misc/eeprom/Makefile
@@ -1,2 +1,3 @@
 obj-$(CONFIG_AT24)             += at24.o
+obj-$(CONFIG_SPI_AT25)         += at25.o
 obj-$(CONFIG_SENSORS_EEPROM)   += eeprom.o

diff --git a/drivers/spi/at25.c b/drivers/misc/eeprom/at25.c
similarity index 100%
rename from drivers/spi/at25.c
rename to drivers/misc/eeprom/at25.c

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 4a6fe01831a8d82354765d256858fca8f760a8df..83a185d52961e5075cd5330de7f770fc4eb28e79 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -230,17 +230,6 @@ config SPI_XILINX
 #
 comment "SPI Protocol Masters"
 
-config SPI_AT25
-       tristate "SPI EEPROMs from most vendors"
-       depends on SYSFS
-       help
-         Enable this driver to get read/write support to most SPI EEPROMs,
-         after you configure the board init code to know about each eeprom
-         on your target board.
-
-         This driver can also be built as a module.  If so, the module
-         will be called at25.
-
 config SPI_SPIDEV
        tristate "User mode SPI device driver support"
        depends on EXPERIMENTAL

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 5e9f521b8844b9b23e25f1dcb165811a96051954..5d0451936d8625eebd4f70dd59f65ab69c2db333 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -33,7 +33,6 @@ obj-$(CONFIG_SPI_SH_SCI)              += spi_sh_sci.o
 #      ... add above this line ...
 
 # SPI protocol drivers (device/link on bus)
-obj-$(CONFIG_SPI_AT25)         += at25.o
 obj-$(CONFIG_SPI_SPIDEV)       += spidev.o
 obj-$(CONFIG_SPI_TLE62X0)      += tle62x0.o
 #      ... add above this line ...