aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2009-01-26 15:19:53 -0500
committerJean Delvare <khali@linux-fr.org>2009-01-26 15:19:53 -0500
commit2e157888f132131f8877affd2785dcee4c227c1d (patch)
tree02cc5eb10e6264fc06da8e2c3d54beeea79887d7 /drivers
parent5195e5093bb7d30dbf057b260005cb4ab9761168 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/chips/Kconfig11
-rw-r--r--drivers/i2c/chips/Makefile1
-rw-r--r--drivers/misc/eeprom/Kconfig11
-rw-r--r--drivers/misc/eeprom/Makefile1
-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 b58e77056b2e..c80312c1f382 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -16,17 +16,6 @@ config DS1682
16 This driver can also be built as a module. If so, the module 16 This driver can also be built as a module. If so, the module
17 will be called ds1682. 17 will be called ds1682.
18 18
19config SENSORS_EEPROM
20 tristate "EEPROM reader"
21 depends on EXPERIMENTAL
22 help
23 If you say yes here you get read-only access to the EEPROM data
24 available on modern memory DIMMs and Sony Vaio laptops. Such
25 EEPROMs could theoretically be available on other devices as well.
26
27 This driver can also be built as a module. If so, the module
28 will be called eeprom.
29
30config SENSORS_PCF8574 19config SENSORS_PCF8574
31 tristate "Philips PCF8574 and PCF8574A (DEPRECATED)" 20 tristate "Philips PCF8574 and PCF8574A (DEPRECATED)"
32 depends on EXPERIMENTAL && GPIO_PCF857X = "n" 21 depends on EXPERIMENTAL && GPIO_PCF857X = "n"
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 5c14776eb76a..d142f238a2de 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -11,7 +11,6 @@
11# 11#
12 12
13obj-$(CONFIG_DS1682) += ds1682.o 13obj-$(CONFIG_DS1682) += ds1682.o
14obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o
15obj-$(CONFIG_SENSORS_MAX6875) += max6875.o 14obj-$(CONFIG_SENSORS_MAX6875) += max6875.o
16obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o 15obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o
17obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o 16obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig
index 0b21778b7d13..3d31b6644245 100644
--- a/drivers/misc/eeprom/Kconfig
+++ b/drivers/misc/eeprom/Kconfig
@@ -26,4 +26,15 @@ config AT24
26 This driver can also be built as a module. If so, the module 26 This driver can also be built as a module. If so, the module
27 will be called at24. 27 will be called at24.
28 28
29config SENSORS_EEPROM
30 tristate "Old I2C EEPROM reader"
31 depends on I2C && EXPERIMENTAL
32 help
33 If you say yes here you get read-only access to the EEPROM data
34 available on modern memory DIMMs and Sony Vaio laptops via I2C. Such
35 EEPROMs could theoretically be available on other devices as well.
36
37 This driver can also be built as a module. If so, the module
38 will be called eeprom.
39
29endmenu 40endmenu
diff --git a/drivers/misc/eeprom/Makefile b/drivers/misc/eeprom/Makefile
index 72cd478eb53f..a3dad28f2724 100644
--- a/drivers/misc/eeprom/Makefile
+++ b/drivers/misc/eeprom/Makefile
@@ -1 +1,2 @@
1obj-$(CONFIG_AT24) += at24.o 1obj-$(CONFIG_AT24) += at24.o
2obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/misc/eeprom/eeprom.c
index 2c27193aeaa0..2c27193aeaa0 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/misc/eeprom/eeprom.c