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 /arch/mips/configs | |
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 'arch/mips/configs')
-rw-r--r-- | arch/mips/configs/bigsur_defconfig | 2 | ||||
-rw-r--r-- | arch/mips/configs/emma2rh_defconfig | 2 | ||||
-rw-r--r-- | arch/mips/configs/fulong_defconfig | 4 | ||||
-rw-r--r-- | arch/mips/configs/msp71xx_defconfig | 2 | ||||
-rw-r--r-- | arch/mips/configs/mtx1_defconfig | 4 | ||||
-rw-r--r-- | arch/mips/configs/pnx8335-stb225_defconfig | 4 | ||||
-rw-r--r-- | arch/mips/configs/rbtx49xx_defconfig | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index a3bbbf067a3b..783da855a2e3 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
@@ -959,7 +959,7 @@ CONFIG_I2C_SIBYTE=y | |||
959 | # Miscellaneous I2C Chip support | 959 | # Miscellaneous I2C Chip support |
960 | # | 960 | # |
961 | # CONFIG_DS1682 is not set | 961 | # CONFIG_DS1682 is not set |
962 | CONFIG_SENSORS_EEPROM=y | 962 | CONFIG_EEPROM_LEGACY=y |
963 | CONFIG_SENSORS_PCF8574=y | 963 | CONFIG_SENSORS_PCF8574=y |
964 | # CONFIG_PCF8575 is not set | 964 | # CONFIG_PCF8575 is not set |
965 | CONFIG_SENSORS_PCF8591=y | 965 | CONFIG_SENSORS_PCF8591=y |
diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig index 634bb4eaf132..fea9bc9865a3 100644 --- a/arch/mips/configs/emma2rh_defconfig +++ b/arch/mips/configs/emma2rh_defconfig | |||
@@ -996,7 +996,7 @@ CONFIG_I2C_CHARDEV=y | |||
996 | # | 996 | # |
997 | # CONFIG_SENSORS_DS1337 is not set | 997 | # CONFIG_SENSORS_DS1337 is not set |
998 | # CONFIG_SENSORS_DS1374 is not set | 998 | # CONFIG_SENSORS_DS1374 is not set |
999 | # CONFIG_SENSORS_EEPROM is not set | 999 | # CONFIG_EEPROM_LEGACY is not set |
1000 | # CONFIG_SENSORS_PCF8574 is not set | 1000 | # CONFIG_SENSORS_PCF8574 is not set |
1001 | # CONFIG_SENSORS_PCA9539 is not set | 1001 | # CONFIG_SENSORS_PCA9539 is not set |
1002 | # CONFIG_SENSORS_PCF8591 is not set | 1002 | # CONFIG_SENSORS_PCF8591 is not set |
diff --git a/arch/mips/configs/fulong_defconfig b/arch/mips/configs/fulong_defconfig index b6698a232ae9..786a9bc9a696 100644 --- a/arch/mips/configs/fulong_defconfig +++ b/arch/mips/configs/fulong_defconfig | |||
@@ -1006,8 +1006,8 @@ CONFIG_I2C_VIAPRO=m | |||
1006 | # Miscellaneous I2C Chip support | 1006 | # Miscellaneous I2C Chip support |
1007 | # | 1007 | # |
1008 | # CONFIG_DS1682 is not set | 1008 | # CONFIG_DS1682 is not set |
1009 | # CONFIG_AT24 is not set | 1009 | # CONFIG_EEPROM_AT24 is not set |
1010 | # CONFIG_SENSORS_EEPROM is not set | 1010 | # CONFIG_EEPROM_LEGACY is not set |
1011 | # CONFIG_SENSORS_PCF8574 is not set | 1011 | # CONFIG_SENSORS_PCF8574 is not set |
1012 | # CONFIG_PCF8575 is not set | 1012 | # CONFIG_PCF8575 is not set |
1013 | # CONFIG_SENSORS_PCA9539 is not set | 1013 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/mips/configs/msp71xx_defconfig b/arch/mips/configs/msp71xx_defconfig index dd13db4d0fb9..84d6491b3d41 100644 --- a/arch/mips/configs/msp71xx_defconfig +++ b/arch/mips/configs/msp71xx_defconfig | |||
@@ -929,7 +929,7 @@ CONFIG_I2C_PMCMSP=y | |||
929 | # | 929 | # |
930 | # CONFIG_SENSORS_DS1337 is not set | 930 | # CONFIG_SENSORS_DS1337 is not set |
931 | # CONFIG_SENSORS_DS1374 is not set | 931 | # CONFIG_SENSORS_DS1374 is not set |
932 | # CONFIG_SENSORS_EEPROM is not set | 932 | # CONFIG_EEPROM_LEGACY is not set |
933 | # CONFIG_SENSORS_PCF8574 is not set | 933 | # CONFIG_SENSORS_PCF8574 is not set |
934 | CONFIG_PMCTWILED=y | 934 | CONFIG_PMCTWILED=y |
935 | # CONFIG_SENSORS_PCA9539 is not set | 935 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig index db9272677aa2..8426d3b9501c 100644 --- a/arch/mips/configs/mtx1_defconfig +++ b/arch/mips/configs/mtx1_defconfig | |||
@@ -1845,7 +1845,7 @@ CONFIG_I2C_VOODOO3=m | |||
1845 | CONFIG_SENSORS_DS1337=m | 1845 | CONFIG_SENSORS_DS1337=m |
1846 | CONFIG_SENSORS_DS1374=m | 1846 | CONFIG_SENSORS_DS1374=m |
1847 | # CONFIG_DS1682 is not set | 1847 | # CONFIG_DS1682 is not set |
1848 | CONFIG_SENSORS_EEPROM=m | 1848 | CONFIG_EEPROM_LEGACY=m |
1849 | CONFIG_SENSORS_PCF8574=m | 1849 | CONFIG_SENSORS_PCF8574=m |
1850 | CONFIG_SENSORS_PCA9539=m | 1850 | CONFIG_SENSORS_PCA9539=m |
1851 | CONFIG_SENSORS_PCF8591=m | 1851 | CONFIG_SENSORS_PCF8591=m |
@@ -1872,7 +1872,7 @@ CONFIG_SPI_BUTTERFLY=m | |||
1872 | # | 1872 | # |
1873 | # SPI Protocol Masters | 1873 | # SPI Protocol Masters |
1874 | # | 1874 | # |
1875 | # CONFIG_SPI_AT25 is not set | 1875 | # CONFIG_EEPROM_AT25 is not set |
1876 | # CONFIG_SPI_SPIDEV is not set | 1876 | # CONFIG_SPI_SPIDEV is not set |
1877 | # CONFIG_SPI_TLE62X0 is not set | 1877 | # CONFIG_SPI_TLE62X0 is not set |
1878 | CONFIG_W1=m | 1878 | CONFIG_W1=m |
diff --git a/arch/mips/configs/pnx8335-stb225_defconfig b/arch/mips/configs/pnx8335-stb225_defconfig index d9536522cff5..2728caa6c2fb 100644 --- a/arch/mips/configs/pnx8335-stb225_defconfig +++ b/arch/mips/configs/pnx8335-stb225_defconfig | |||
@@ -640,8 +640,8 @@ CONFIG_I2C_CHARDEV=y | |||
640 | # Miscellaneous I2C Chip support | 640 | # Miscellaneous I2C Chip support |
641 | # | 641 | # |
642 | # CONFIG_DS1682 is not set | 642 | # CONFIG_DS1682 is not set |
643 | # CONFIG_AT24 is not set | 643 | # CONFIG_EEPROM_AT24 is not set |
644 | # CONFIG_SENSORS_EEPROM is not set | 644 | # CONFIG_EEPROM_LEGACY is not set |
645 | # CONFIG_SENSORS_PCF8574 is not set | 645 | # CONFIG_SENSORS_PCF8574 is not set |
646 | # CONFIG_PCF8575 is not set | 646 | # CONFIG_PCF8575 is not set |
647 | # CONFIG_SENSORS_PCA9539 is not set | 647 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/mips/configs/rbtx49xx_defconfig b/arch/mips/configs/rbtx49xx_defconfig index c7c0864b8ce9..83d5c58662c8 100644 --- a/arch/mips/configs/rbtx49xx_defconfig +++ b/arch/mips/configs/rbtx49xx_defconfig | |||
@@ -522,7 +522,7 @@ CONFIG_SPI_TXX9=y | |||
522 | # | 522 | # |
523 | # SPI Protocol Masters | 523 | # SPI Protocol Masters |
524 | # | 524 | # |
525 | CONFIG_SPI_AT25=y | 525 | CONFIG_EEPROM_AT25=y |
526 | # CONFIG_SPI_TLE62X0 is not set | 526 | # CONFIG_SPI_TLE62X0 is not set |
527 | CONFIG_HAVE_GPIO_LIB=y | 527 | CONFIG_HAVE_GPIO_LIB=y |
528 | 528 | ||