aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-01-26 21:19:57 +0100
committerJean Delvare <khali@linux-fr.org>2009-01-26 21:19:57 +0100
commitdd7f8dbe2b3c0611ba969cd867c10cb63d163e25 (patch)
tree3f87d94235a7b7a5248b59ab4c1c4132984f237b /drivers/misc
parent0eb6da20681db9b5d5769d3e1aca877f4a77d8fb (diff)
downloadkernel_goldelico_gta04-dd7f8dbe2b3c0611ba969cd867c10cb63d163e25.zip
kernel_goldelico_gta04-dd7f8dbe2b3c0611ba969cd867c10cb63d163e25.tar.gz
kernel_goldelico_gta04-dd7f8dbe2b3c0611ba969cd867c10cb63d163e25.tar.bz2
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/Kconfig8
-rw-r--r--drivers/misc/eeprom/Makefile6
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig
index 62aae33..c76df8c 100644
--- a/drivers/misc/eeprom/Kconfig
+++ b/drivers/misc/eeprom/Kconfig
@@ -1,6 +1,6 @@
menu "EEPROM support"
-config AT24
+config EEPROM_AT24
tristate "I2C EEPROMs from most vendors"
depends on I2C && SYSFS && EXPERIMENTAL
help
@@ -26,7 +26,7 @@ config AT24
This driver can also be built as a module. If so, the module
will be called at24.
-config SPI_AT25
+config EEPROM_AT25
tristate "SPI EEPROMs from most vendors"
depends on SPI && SYSFS
help
@@ -37,9 +37,9 @@ config SPI_AT25
This driver can also be built as a module. If so, the module
will be called at25.
-config SENSORS_EEPROM
+config EEPROM_LEGACY
tristate "Old I2C EEPROM reader"
- depends on I2C && EXPERIMENTAL
+ depends on I2C && SYSFS
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
diff --git a/drivers/misc/eeprom/Makefile b/drivers/misc/eeprom/Makefile
index 3b7af6d..539dd8f 100644
--- a/drivers/misc/eeprom/Makefile
+++ b/drivers/misc/eeprom/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_AT24) += at24.o
-obj-$(CONFIG_SPI_AT25) += at25.o
-obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o
+obj-$(CONFIG_EEPROM_AT24) += at24.o
+obj-$(CONFIG_EEPROM_AT25) += at25.o
+obj-$(CONFIG_EEPROM_LEGACY) += eeprom.o
obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o