diff options
| author | Jean Delvare <khali@linux-fr.org> | 2009-01-26 15:19:57 -0500 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2009-01-26 15:19:57 -0500 |
| commit | dd7f8dbe2b3c0611ba969cd867c10cb63d163e25 (patch) | |
| tree | 3f87d94235a7b7a5248b59ab4c1c4132984f237b /drivers/misc | |
| parent | 0eb6da20681db9b5d5769d3e1aca877f4a77d8fb (diff) | |
eeprom: More consistent symbol names
Now that all EEPROM drivers live in the same place, let's harmonize
their symbol names.
Also fix eeprom's dependencies, it definitely needs sysfs, and is no
longer experimental after many years in the kernel tree.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/eeprom/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/misc/eeprom/Makefile | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig index 62aae334ee68..c76df8cda5ef 100644 --- a/drivers/misc/eeprom/Kconfig +++ b/drivers/misc/eeprom/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | menu "EEPROM support" | 1 | menu "EEPROM support" |
| 2 | 2 | ||
| 3 | config AT24 | 3 | config EEPROM_AT24 |
| 4 | tristate "I2C EEPROMs from most vendors" | 4 | tristate "I2C EEPROMs from most vendors" |
| 5 | depends on I2C && SYSFS && EXPERIMENTAL | 5 | depends on I2C && SYSFS && EXPERIMENTAL |
| 6 | help | 6 | help |
| @@ -26,7 +26,7 @@ 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 SPI_AT25 | 29 | config EEPROM_AT25 |
| 30 | tristate "SPI EEPROMs from most vendors" | 30 | tristate "SPI EEPROMs from most vendors" |
| 31 | depends on SPI && SYSFS | 31 | depends on SPI && SYSFS |
| 32 | help | 32 | help |
| @@ -37,9 +37,9 @@ config SPI_AT25 | |||
| 37 | This driver can also be built as a module. If so, the module | 37 | This driver can also be built as a module. If so, the module |
| 38 | will be called at25. | 38 | will be called at25. |
| 39 | 39 | ||
| 40 | config SENSORS_EEPROM | 40 | config EEPROM_LEGACY |
| 41 | tristate "Old I2C EEPROM reader" | 41 | tristate "Old I2C EEPROM reader" |
| 42 | depends on I2C && EXPERIMENTAL | 42 | depends on I2C && SYSFS |
| 43 | help | 43 | help |
| 44 | If you say yes here you get read-only access to the EEPROM data | 44 | If you say yes here you get read-only access to the EEPROM data |
| 45 | available on modern memory DIMMs and Sony Vaio laptops via I2C. Such | 45 | available on modern memory DIMMs and Sony Vaio laptops via I2C. Such |
diff --git a/drivers/misc/eeprom/Makefile b/drivers/misc/eeprom/Makefile index 3b7af6df79a7..539dd8f88128 100644 --- a/drivers/misc/eeprom/Makefile +++ b/drivers/misc/eeprom/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | obj-$(CONFIG_AT24) += at24.o | 1 | obj-$(CONFIG_EEPROM_AT24) += at24.o |
| 2 | obj-$(CONFIG_SPI_AT25) += at25.o | 2 | obj-$(CONFIG_EEPROM_AT25) += at25.o |
| 3 | obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o | 3 | obj-$(CONFIG_EEPROM_LEGACY) += eeprom.o |
| 4 | obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o | 4 | obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o |