diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2009-01-26 21:19:53 +0100 | 
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2009-01-26 21:19:53 +0100 | 
| commit | 2e157888f132131f8877affd2785dcee4c227c1d (patch) | |
| tree | 02cc5eb10e6264fc06da8e2c3d54beeea79887d7 | |
| parent | 5195e5093bb7d30dbf057b260005cb4ab9761168 (diff) | |
| download | olio-linux-3.10-2e157888f132131f8877affd2785dcee4c227c1d.tar.xz olio-linux-3.10-2e157888f132131f8877affd2785dcee4c227c1d.zip  | |
i2c: Move old eeprom driver to /drivers/misc/eeprom
Update Kconfig text to specify this driver as I2C.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
| -rw-r--r-- | drivers/i2c/chips/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/i2c/chips/Makefile | 1 | ||||
| -rw-r--r-- | drivers/misc/eeprom/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/misc/eeprom/Makefile | 1 | ||||
| -rw-r--r-- | drivers/misc/eeprom/eeprom.c (renamed from drivers/i2c/chips/eeprom.c) | 0 | 
5 files changed, 12 insertions, 12 deletions
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig index b58e77056b2..c80312c1f38 100644 --- a/drivers/i2c/chips/Kconfig +++ b/drivers/i2c/chips/Kconfig @@ -16,17 +16,6 @@ config DS1682  	  This driver can also be built as a module.  If so, the module  	  will be called ds1682. -config SENSORS_EEPROM -	tristate "EEPROM reader" -	depends on EXPERIMENTAL -	help -	  If you say yes here you get read-only access to the EEPROM data -	  available on modern memory DIMMs and Sony Vaio laptops.  Such -	  EEPROMs could theoretically be available on other devices as well. - -	  This driver can also be built as a module.  If so, the module -	  will be called eeprom. -  config SENSORS_PCF8574  	tristate "Philips PCF8574 and PCF8574A (DEPRECATED)"  	depends on EXPERIMENTAL && GPIO_PCF857X = "n" diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile index 5c14776eb76..d142f238a2d 100644 --- a/drivers/i2c/chips/Makefile +++ b/drivers/i2c/chips/Makefile @@ -11,7 +11,6 @@  #  obj-$(CONFIG_DS1682)		+= ds1682.o -obj-$(CONFIG_SENSORS_EEPROM)	+= eeprom.o  obj-$(CONFIG_SENSORS_MAX6875)	+= max6875.o  obj-$(CONFIG_SENSORS_PCA9539)	+= pca9539.o  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig index 0b21778b7d1..3d31b664424 100644 --- a/drivers/misc/eeprom/Kconfig +++ b/drivers/misc/eeprom/Kconfig @@ -26,4 +26,15 @@ config AT24  	  This driver can also be built as a module.  If so, the module  	  will be called at24. +config SENSORS_EEPROM +	tristate "Old I2C EEPROM reader" +	depends on I2C && EXPERIMENTAL +	help +	  If you say yes here you get read-only access to the EEPROM data +	  available on modern memory DIMMs and Sony Vaio laptops via I2C. Such +	  EEPROMs could theoretically be available on other devices as well. + +	  This driver can also be built as a module.  If so, the module +	  will be called eeprom. +  endmenu diff --git a/drivers/misc/eeprom/Makefile b/drivers/misc/eeprom/Makefile index 72cd478eb53..a3dad28f272 100644 --- a/drivers/misc/eeprom/Makefile +++ b/drivers/misc/eeprom/Makefile @@ -1 +1,2 @@  obj-$(CONFIG_AT24)		+= at24.o +obj-$(CONFIG_SENSORS_EEPROM)	+= eeprom.o diff --git a/drivers/i2c/chips/eeprom.c b/drivers/misc/eeprom/eeprom.c index 2c27193aeaa..2c27193aeaa 100644 --- a/drivers/i2c/chips/eeprom.c +++ b/drivers/misc/eeprom/eeprom.c  |