diff options
-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 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 | ||
19 | config 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 | |||
30 | config SENSORS_PCF8574 | 19 | config 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 | ||
13 | obj-$(CONFIG_DS1682) += ds1682.o | 13 | obj-$(CONFIG_DS1682) += ds1682.o |
14 | obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o | ||
15 | obj-$(CONFIG_SENSORS_MAX6875) += max6875.o | 14 | obj-$(CONFIG_SENSORS_MAX6875) += max6875.o |
16 | obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o | 15 | obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o |
17 | obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o | 16 | obj-$(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 | ||
29 | config 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 | |||
29 | endmenu | 40 | endmenu |
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 @@ | |||
1 | obj-$(CONFIG_AT24) += at24.o | 1 | obj-$(CONFIG_AT24) += at24.o |
2 | obj-$(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 | |||