diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2009-01-26 21:19:54 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2009-01-26 21:19:54 +0100 |
| commit | e51d565ff6bb1cedc10568425511badf0633a212 (patch) | |
| tree | c8bd2623f2b925e1c8fb451d022529410f9c3406 | |
| parent | 2e157888f132131f8877affd2785dcee4c227c1d (diff) | |
| download | talos-obmc-linux-e51d565ff6bb1cedc10568425511badf0633a212.tar.gz talos-obmc-linux-e51d565ff6bb1cedc10568425511badf0633a212.zip | |
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>
| -rw-r--r-- | drivers/misc/eeprom/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/misc/eeprom/Makefile | 1 | ||||
| -rw-r--r-- | drivers/misc/eeprom/at25.c (renamed from drivers/spi/at25.c) | 0 | ||||
| -rw-r--r-- | drivers/spi/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/spi/Makefile | 1 |
5 files changed, 12 insertions, 12 deletions
diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig index 3d31b6644245..5bf3c92d7162 100644 --- 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 a3dad28f2724..a4fb5cf8ffe6 100644 --- 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 index 290dbe99647a..290dbe99647a 100644 --- a/drivers/spi/at25.c +++ b/drivers/misc/eeprom/at25.c diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 4a6fe01831a8..83a185d52961 100644 --- 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 5e9f521b8844..5d0451936d86 100644 --- 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 ... |
