aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-01-26 15:19:57 -0500
committerJean Delvare <khali@linux-fr.org>2009-01-26 15:19:57 -0500
commitdd7f8dbe2b3c0611ba969cd867c10cb63d163e25 (patch)
tree3f87d94235a7b7a5248b59ab4c1c4132984f237b /arch/powerpc
parent0eb6da20681db9b5d5769d3e1aca877f4a77d8fb (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/powerpc')
-rw-r--r--arch/powerpc/configs/44x/sam440ep_defconfig4
-rw-r--r--arch/powerpc/configs/44x/warp_defconfig4
-rw-r--r--arch/powerpc/configs/52xx/cm5200_defconfig4
-rw-r--r--arch/powerpc/configs/52xx/lite5200b_defconfig4
-rw-r--r--arch/powerpc/configs/52xx/motionpro_defconfig4
-rw-r--r--arch/powerpc/configs/52xx/pcm030_defconfig4
-rw-r--r--arch/powerpc/configs/52xx/tqm5200_defconfig4
-rw-r--r--arch/powerpc/configs/83xx/asp8347_defconfig4
-rw-r--r--arch/powerpc/configs/83xx/mpc8313_rdb_defconfig6
-rw-r--r--arch/powerpc/configs/83xx/mpc8315_rdb_defconfig6
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_mds_defconfig4
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_rdb_defconfig6
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig6
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig6
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_mds_defconfig4
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_mds_defconfig4
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_rdk_defconfig6
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_mds_defconfig4
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_rdb_defconfig4
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig4
-rw-r--r--arch/powerpc/configs/85xx/mpc8536_ds_defconfig4
-rw-r--r--arch/powerpc/configs/85xx/mpc8544_ds_defconfig4
-rw-r--r--arch/powerpc/configs/85xx/mpc8568mds_defconfig4
-rw-r--r--arch/powerpc/configs/85xx/mpc8572_ds_defconfig4
-rw-r--r--arch/powerpc/configs/85xx/stx_gp3_defconfig4
-rw-r--r--arch/powerpc/configs/85xx/tqm8540_defconfig4
-rw-r--r--arch/powerpc/configs/85xx/tqm8541_defconfig4
-rw-r--r--arch/powerpc/configs/85xx/tqm8548_defconfig4
-rw-r--r--arch/powerpc/configs/85xx/tqm8555_defconfig4
-rw-r--r--arch/powerpc/configs/85xx/tqm8560_defconfig4
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc610_defconfig4
-rw-r--r--arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig4
-rw-r--r--arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig4
-rw-r--r--arch/powerpc/configs/86xx/sbc8641d_defconfig4
-rw-r--r--arch/powerpc/configs/c2k_defconfig4
-rw-r--r--arch/powerpc/configs/cell_defconfig2
-rw-r--r--arch/powerpc/configs/celleb_defconfig2
-rw-r--r--arch/powerpc/configs/chrp32_defconfig4
-rw-r--r--arch/powerpc/configs/g5_defconfig4
-rw-r--r--arch/powerpc/configs/linkstation_defconfig4
-rw-r--r--arch/powerpc/configs/maple_defconfig4
-rw-r--r--arch/powerpc/configs/mpc5200_defconfig4
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig4
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig4
-rw-r--r--arch/powerpc/configs/mpc86xx_defconfig4
-rw-r--r--arch/powerpc/configs/pasemi_defconfig2
-rw-r--r--arch/powerpc/configs/pmac32_defconfig4
-rw-r--r--arch/powerpc/configs/ppc40x_defconfig4
-rw-r--r--arch/powerpc/configs/ppc44x_defconfig4
-rw-r--r--arch/powerpc/configs/ppc64_defconfig4
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig4
-rw-r--r--arch/powerpc/configs/prpmc2800_defconfig4
-rw-r--r--arch/powerpc/configs/pseries_defconfig4
-rw-r--r--arch/powerpc/configs/storcenter_defconfig4
54 files changed, 111 insertions, 111 deletions
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig
index 15f48e03ec2e..ce28cd6f0d4f 100644
--- a/arch/powerpc/configs/44x/sam440ep_defconfig
+++ b/arch/powerpc/configs/44x/sam440ep_defconfig
@@ -730,8 +730,8 @@ CONFIG_I2C_IBM_IIC=y
730# Miscellaneous I2C Chip support 730# Miscellaneous I2C Chip support
731# 731#
732# CONFIG_DS1682 is not set 732# CONFIG_DS1682 is not set
733# CONFIG_AT24 is not set 733# CONFIG_EEPROM_AT24 is not set
734# CONFIG_SENSORS_EEPROM is not set 734# CONFIG_EEPROM_LEGACY is not set
735# CONFIG_SENSORS_PCF8574 is not set 735# CONFIG_SENSORS_PCF8574 is not set
736# CONFIG_PCF8575 is not set 736# CONFIG_PCF8575 is not set
737# CONFIG_SENSORS_PCA9539 is not set 737# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig
index 59cbd2761ed7..031ac6d4212f 100644
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_defconfig
@@ -660,8 +660,8 @@ CONFIG_I2C_HELPER_AUTO=y
660# Miscellaneous I2C Chip support 660# Miscellaneous I2C Chip support
661# 661#
662# CONFIG_DS1682 is not set 662# CONFIG_DS1682 is not set
663# CONFIG_AT24 is not set 663# CONFIG_EEPROM_AT24 is not set
664CONFIG_SENSORS_EEPROM=y 664CONFIG_EEPROM_LEGACY=y
665# CONFIG_SENSORS_PCF8574 is not set 665# CONFIG_SENSORS_PCF8574 is not set
666# CONFIG_PCF8575 is not set 666# CONFIG_PCF8575 is not set
667# CONFIG_SENSORS_PCA9539 is not set 667# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig
index 3df627494b65..99c495ad9c75 100644
--- a/arch/powerpc/configs/52xx/cm5200_defconfig
+++ b/arch/powerpc/configs/52xx/cm5200_defconfig
@@ -629,8 +629,8 @@ CONFIG_I2C_MPC=y
629# Miscellaneous I2C Chip support 629# Miscellaneous I2C Chip support
630# 630#
631# CONFIG_DS1682 is not set 631# CONFIG_DS1682 is not set
632# CONFIG_AT24 is not set 632# CONFIG_EEPROM_AT24 is not set
633# CONFIG_SENSORS_EEPROM is not set 633# CONFIG_EEPROM_LEGACY is not set
634# CONFIG_SENSORS_PCF8574 is not set 634# CONFIG_SENSORS_PCF8574 is not set
635# CONFIG_PCF8575 is not set 635# CONFIG_PCF8575 is not set
636# CONFIG_SENSORS_PCA9539 is not set 636# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig
index 5b969f9c925e..9796220032fd 100644
--- a/arch/powerpc/configs/52xx/lite5200b_defconfig
+++ b/arch/powerpc/configs/52xx/lite5200b_defconfig
@@ -762,8 +762,8 @@ CONFIG_I2C_MPC=y
762# Miscellaneous I2C Chip support 762# Miscellaneous I2C Chip support
763# 763#
764# CONFIG_DS1682 is not set 764# CONFIG_DS1682 is not set
765# CONFIG_AT24 is not set 765# CONFIG_EEPROM_AT24 is not set
766# CONFIG_SENSORS_EEPROM is not set 766# CONFIG_EEPROM_LEGACY is not set
767# CONFIG_SENSORS_PCF8574 is not set 767# CONFIG_SENSORS_PCF8574 is not set
768# CONFIG_PCF8575 is not set 768# CONFIG_PCF8575 is not set
769# CONFIG_SENSORS_PCA9539 is not set 769# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig
index 3c0d4e561726..d081e0031057 100644
--- a/arch/powerpc/configs/52xx/motionpro_defconfig
+++ b/arch/powerpc/configs/52xx/motionpro_defconfig
@@ -629,8 +629,8 @@ CONFIG_I2C_MPC=y
629# Miscellaneous I2C Chip support 629# Miscellaneous I2C Chip support
630# 630#
631# CONFIG_DS1682 is not set 631# CONFIG_DS1682 is not set
632# CONFIG_AT24 is not set 632# CONFIG_EEPROM_AT24 is not set
633CONFIG_SENSORS_EEPROM=y 633CONFIG_EEPROM_LEGACY=y
634# CONFIG_SENSORS_PCF8574 is not set 634# CONFIG_SENSORS_PCF8574 is not set
635# CONFIG_PCF8575 is not set 635# CONFIG_PCF8575 is not set
636# CONFIG_SENSORS_PCA9539 is not set 636# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig
index 9d0207783d60..b21b8e8c3a78 100644
--- a/arch/powerpc/configs/52xx/pcm030_defconfig
+++ b/arch/powerpc/configs/52xx/pcm030_defconfig
@@ -740,8 +740,8 @@ CONFIG_I2C_MPC=y
740# Miscellaneous I2C Chip support 740# Miscellaneous I2C Chip support
741# 741#
742# CONFIG_DS1682 is not set 742# CONFIG_DS1682 is not set
743# CONFIG_AT24 is not set 743# CONFIG_EEPROM_AT24 is not set
744CONFIG_SENSORS_EEPROM=m 744CONFIG_EEPROM_LEGACY=m
745# CONFIG_SENSORS_PCF8574 is not set 745# CONFIG_SENSORS_PCF8574 is not set
746# CONFIG_PCF8575 is not set 746# CONFIG_PCF8575 is not set
747# CONFIG_SENSORS_PCA9539 is not set 747# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig
index bc190051e8d5..79954579f5ec 100644
--- a/arch/powerpc/configs/52xx/tqm5200_defconfig
+++ b/arch/powerpc/configs/52xx/tqm5200_defconfig
@@ -645,8 +645,8 @@ CONFIG_I2C_MPC=y
645# Miscellaneous I2C Chip support 645# Miscellaneous I2C Chip support
646# 646#
647# CONFIG_DS1682 is not set 647# CONFIG_DS1682 is not set
648# CONFIG_AT24 is not set 648# CONFIG_EEPROM_AT24 is not set
649# CONFIG_SENSORS_EEPROM is not set 649# CONFIG_EEPROM_LEGACY is not set
650# CONFIG_SENSORS_PCF8574 is not set 650# CONFIG_SENSORS_PCF8574 is not set
651# CONFIG_PCF8575 is not set 651# CONFIG_PCF8575 is not set
652# CONFIG_SENSORS_PCA9539 is not set 652# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index cbecaf3d7906..b3d9d1a8dfaf 100644
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig
@@ -732,8 +732,8 @@ CONFIG_I2C_MPC=y
732# Miscellaneous I2C Chip support 732# Miscellaneous I2C Chip support
733# 733#
734# CONFIG_DS1682 is not set 734# CONFIG_DS1682 is not set
735# CONFIG_AT24 is not set 735# CONFIG_EEPROM_AT24 is not set
736# CONFIG_SENSORS_EEPROM is not set 736# CONFIG_EEPROM_LEGACY is not set
737# CONFIG_SENSORS_PCF8574 is not set 737# CONFIG_SENSORS_PCF8574 is not set
738# CONFIG_PCF8575 is not set 738# CONFIG_PCF8575 is not set
739# CONFIG_SENSORS_PCA9539 is not set 739# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index bfc32ea265a7..6293bb99b52e 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -858,8 +858,8 @@ CONFIG_I2C_MPC=y
858# Miscellaneous I2C Chip support 858# Miscellaneous I2C Chip support
859# 859#
860# CONFIG_DS1682 is not set 860# CONFIG_DS1682 is not set
861# CONFIG_AT24 is not set 861# CONFIG_EEPROM_AT24 is not set
862# CONFIG_SENSORS_EEPROM is not set 862# CONFIG_EEPROM_LEGACY is not set
863# CONFIG_SENSORS_PCF8574 is not set 863# CONFIG_SENSORS_PCF8574 is not set
864# CONFIG_PCF8575 is not set 864# CONFIG_PCF8575 is not set
865# CONFIG_SENSORS_PCA9539 is not set 865# CONFIG_SENSORS_PCA9539 is not set
@@ -884,7 +884,7 @@ CONFIG_SPI_MPC83xx=y
884# 884#
885# SPI Protocol Masters 885# SPI Protocol Masters
886# 886#
887# CONFIG_SPI_AT25 is not set 887# CONFIG_EEPROM_AT25 is not set
888# CONFIG_SPI_SPIDEV is not set 888# CONFIG_SPI_SPIDEV is not set
889# CONFIG_SPI_TLE62X0 is not set 889# CONFIG_SPI_TLE62X0 is not set
890CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 890CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index aad0e1a98c55..c7cceb4536d8 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -919,8 +919,8 @@ CONFIG_I2C_MPC=y
919# Miscellaneous I2C Chip support 919# Miscellaneous I2C Chip support
920# 920#
921# CONFIG_DS1682 is not set 921# CONFIG_DS1682 is not set
922# CONFIG_AT24 is not set 922# CONFIG_EEPROM_AT24 is not set
923# CONFIG_SENSORS_EEPROM is not set 923# CONFIG_EEPROM_LEGACY is not set
924# CONFIG_SENSORS_PCF8574 is not set 924# CONFIG_SENSORS_PCF8574 is not set
925# CONFIG_PCF8575 is not set 925# CONFIG_PCF8575 is not set
926# CONFIG_SENSORS_PCA9539 is not set 926# CONFIG_SENSORS_PCA9539 is not set
@@ -945,7 +945,7 @@ CONFIG_SPI_MPC83xx=y
945# 945#
946# SPI Protocol Masters 946# SPI Protocol Masters
947# 947#
948# CONFIG_SPI_AT25 is not set 948# CONFIG_EEPROM_AT25 is not set
949# CONFIG_SPI_SPIDEV is not set 949# CONFIG_SPI_SPIDEV is not set
950# CONFIG_SPI_TLE62X0 is not set 950# CONFIG_SPI_TLE62X0 is not set
951CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 951CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index 9cb8c8b956e4..5e3cd49a2e9c 100644
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -730,8 +730,8 @@ CONFIG_I2C_MPC=y
730# Miscellaneous I2C Chip support 730# Miscellaneous I2C Chip support
731# 731#
732# CONFIG_DS1682 is not set 732# CONFIG_DS1682 is not set
733# CONFIG_AT24 is not set 733# CONFIG_EEPROM_AT24 is not set
734# CONFIG_SENSORS_EEPROM is not set 734# CONFIG_EEPROM_LEGACY is not set
735# CONFIG_SENSORS_PCF8574 is not set 735# CONFIG_SENSORS_PCF8574 is not set
736# CONFIG_PCF8575 is not set 736# CONFIG_PCF8575 is not set
737# CONFIG_SENSORS_PCA9539 is not set 737# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index 9cc976f010c9..90c482606880 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -745,8 +745,8 @@ CONFIG_I2C_MPC=y
745# Miscellaneous I2C Chip support 745# Miscellaneous I2C Chip support
746# 746#
747# CONFIG_DS1682 is not set 747# CONFIG_DS1682 is not set
748# CONFIG_AT24 is not set 748# CONFIG_EEPROM_AT24 is not set
749# CONFIG_SENSORS_EEPROM is not set 749# CONFIG_EEPROM_LEGACY is not set
750# CONFIG_SENSORS_PCF8574 is not set 750# CONFIG_SENSORS_PCF8574 is not set
751# CONFIG_PCF8575 is not set 751# CONFIG_PCF8575 is not set
752# CONFIG_SENSORS_PCA9539 is not set 752# CONFIG_SENSORS_PCA9539 is not set
@@ -770,7 +770,7 @@ CONFIG_SPI_MPC83xx=y
770# 770#
771# SPI Protocol Masters 771# SPI Protocol Masters
772# 772#
773# CONFIG_SPI_AT25 is not set 773# CONFIG_EEPROM_AT25 is not set
774# CONFIG_SPI_SPIDEV is not set 774# CONFIG_SPI_SPIDEV is not set
775# CONFIG_SPI_TLE62X0 is not set 775# CONFIG_SPI_TLE62X0 is not set
776CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 776CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index 07a674f5344e..42b7f3403fb0 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -898,8 +898,8 @@ CONFIG_I2C_MPC=y
898# Miscellaneous I2C Chip support 898# Miscellaneous I2C Chip support
899# 899#
900# CONFIG_DS1682 is not set 900# CONFIG_DS1682 is not set
901# CONFIG_AT24 is not set 901# CONFIG_EEPROM_AT24 is not set
902# CONFIG_SENSORS_EEPROM is not set 902# CONFIG_EEPROM_LEGACY is not set
903CONFIG_SENSORS_PCF8574=y 903CONFIG_SENSORS_PCF8574=y
904# CONFIG_PCF8575 is not set 904# CONFIG_PCF8575 is not set
905# CONFIG_SENSORS_PCA9539 is not set 905# CONFIG_SENSORS_PCA9539 is not set
@@ -923,7 +923,7 @@ CONFIG_SPI_MPC83xx=y
923# 923#
924# SPI Protocol Masters 924# SPI Protocol Masters
925# 925#
926# CONFIG_SPI_AT25 is not set 926# CONFIG_EEPROM_AT25 is not set
927# CONFIG_SPI_SPIDEV is not set 927# CONFIG_SPI_SPIDEV is not set
928# CONFIG_SPI_TLE62X0 is not set 928# CONFIG_SPI_TLE62X0 is not set
929CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 929CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index 426232cb0097..17c903b36576 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
@@ -778,8 +778,8 @@ CONFIG_I2C_MPC=y
778# Miscellaneous I2C Chip support 778# Miscellaneous I2C Chip support
779# 779#
780# CONFIG_DS1682 is not set 780# CONFIG_DS1682 is not set
781# CONFIG_AT24 is not set 781# CONFIG_EEPROM_AT24 is not set
782# CONFIG_SENSORS_EEPROM is not set 782# CONFIG_EEPROM_LEGACY is not set
783CONFIG_SENSORS_PCF8574=y 783CONFIG_SENSORS_PCF8574=y
784# CONFIG_PCF8575 is not set 784# CONFIG_PCF8575 is not set
785# CONFIG_SENSORS_PCA9539 is not set 785# CONFIG_SENSORS_PCA9539 is not set
@@ -803,7 +803,7 @@ CONFIG_SPI_MPC83xx=y
803# 803#
804# SPI Protocol Masters 804# SPI Protocol Masters
805# 805#
806# CONFIG_SPI_AT25 is not set 806# CONFIG_EEPROM_AT25 is not set
807# CONFIG_SPI_SPIDEV is not set 807# CONFIG_SPI_SPIDEV is not set
808# CONFIG_SPI_TLE62X0 is not set 808# CONFIG_SPI_TLE62X0 is not set
809CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 809CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index 36e2e93a1c53..728fc95d5870 100644
--- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
@@ -673,8 +673,8 @@ CONFIG_I2C_MPC=y
673# Miscellaneous I2C Chip support 673# Miscellaneous I2C Chip support
674# 674#
675# CONFIG_DS1682 is not set 675# CONFIG_DS1682 is not set
676# CONFIG_AT24 is not set 676# CONFIG_EEPROM_AT24 is not set
677# CONFIG_SENSORS_EEPROM is not set 677# CONFIG_EEPROM_LEGACY is not set
678# CONFIG_SENSORS_PCF8574 is not set 678# CONFIG_SENSORS_PCF8574 is not set
679# CONFIG_PCF8575 is not set 679# CONFIG_PCF8575 is not set
680# CONFIG_SENSORS_PCA9539 is not set 680# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index 80eb6c9a05c4..f7546e7cb762 100644
--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@ -805,8 +805,8 @@ CONFIG_I2C_MPC=y
805# Miscellaneous I2C Chip support 805# Miscellaneous I2C Chip support
806# 806#
807# CONFIG_DS1682 is not set 807# CONFIG_DS1682 is not set
808# CONFIG_AT24 is not set 808# CONFIG_EEPROM_AT24 is not set
809# CONFIG_SENSORS_EEPROM is not set 809# CONFIG_EEPROM_LEGACY is not set
810# CONFIG_SENSORS_PCF8574 is not set 810# CONFIG_SENSORS_PCF8574 is not set
811# CONFIG_PCF8575 is not set 811# CONFIG_PCF8575 is not set
812# CONFIG_SENSORS_PCA9539 is not set 812# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index b9b236806e9f..b94972f52241 100644
--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
@@ -723,8 +723,8 @@ CONFIG_I2C_MPC=y
723# Miscellaneous I2C Chip support 723# Miscellaneous I2C Chip support
724# 724#
725# CONFIG_DS1682 is not set 725# CONFIG_DS1682 is not set
726# CONFIG_AT24 is not set 726# CONFIG_EEPROM_AT24 is not set
727# CONFIG_SENSORS_EEPROM is not set 727# CONFIG_EEPROM_LEGACY is not set
728# CONFIG_SENSORS_PCF8574 is not set 728# CONFIG_SENSORS_PCF8574 is not set
729# CONFIG_PCF8575 is not set 729# CONFIG_PCF8575 is not set
730# CONFIG_SENSORS_PCA9539 is not set 730# CONFIG_SENSORS_PCA9539 is not set
@@ -749,7 +749,7 @@ CONFIG_SPI_MPC83xx=y
749# 749#
750# SPI Protocol Masters 750# SPI Protocol Masters
751# 751#
752# CONFIG_SPI_AT25 is not set 752# CONFIG_EEPROM_AT25 is not set
753CONFIG_SPI_SPIDEV=y 753CONFIG_SPI_SPIDEV=y
754# CONFIG_SPI_TLE62X0 is not set 754# CONFIG_SPI_TLE62X0 is not set
755CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 755CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index f6350d7e1688..ad97649bdc73 100644
--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
@@ -787,8 +787,8 @@ CONFIG_I2C_MPC=y
787# Miscellaneous I2C Chip support 787# Miscellaneous I2C Chip support
788# 788#
789# CONFIG_DS1682 is not set 789# CONFIG_DS1682 is not set
790# CONFIG_AT24 is not set 790# CONFIG_EEPROM_AT24 is not set
791# CONFIG_SENSORS_EEPROM is not set 791# CONFIG_EEPROM_LEGACY is not set
792# CONFIG_SENSORS_PCF8574 is not set 792# CONFIG_SENSORS_PCF8574 is not set
793# CONFIG_PCF8575 is not set 793# CONFIG_PCF8575 is not set
794# CONFIG_SENSORS_PCA9539 is not set 794# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index f447de16f75d..2e526beeeb90 100644
--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
@@ -789,8 +789,8 @@ CONFIG_I2C_MPC=y
789# Miscellaneous I2C Chip support 789# Miscellaneous I2C Chip support
790# 790#
791# CONFIG_DS1682 is not set 791# CONFIG_DS1682 is not set
792# CONFIG_AT24 is not set 792# CONFIG_EEPROM_AT24 is not set
793# CONFIG_SENSORS_EEPROM is not set 793# CONFIG_EEPROM_LEGACY is not set
794# CONFIG_SENSORS_PCF8574 is not set 794# CONFIG_SENSORS_PCF8574 is not set
795# CONFIG_PCF8575 is not set 795# CONFIG_PCF8575 is not set
796# CONFIG_SENSORS_PCA9539 is not set 796# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index 8d2d7eeab5f5..54bb24a5e02a 100644
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig
+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -640,8 +640,8 @@ CONFIG_I2C_MPC=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/powerpc/configs/85xx/mpc8536_ds_defconfig b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig
index e243e14a6708..256055cb6d2f 100644
--- a/arch/powerpc/configs/85xx/mpc8536_ds_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig
@@ -849,8 +849,8 @@ CONFIG_I2C_MPC=y
849# Miscellaneous I2C Chip support 849# Miscellaneous I2C Chip support
850# 850#
851# CONFIG_DS1682 is not set 851# CONFIG_DS1682 is not set
852# CONFIG_AT24 is not set 852# CONFIG_EEPROM_AT24 is not set
853CONFIG_SENSORS_EEPROM=y 853CONFIG_EEPROM_LEGACY=y
854# CONFIG_SENSORS_PCF8574 is not set 854# CONFIG_SENSORS_PCF8574 is not set
855# CONFIG_PCF8575 is not set 855# CONFIG_PCF8575 is not set
856# CONFIG_SENSORS_PCA9539 is not set 856# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
index f6cb01495ea6..5ac7e51e9f14 100644
--- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
@@ -848,8 +848,8 @@ CONFIG_I2C_MPC=y
848# Miscellaneous I2C Chip support 848# Miscellaneous I2C Chip support
849# 849#
850# CONFIG_DS1682 is not set 850# CONFIG_DS1682 is not set
851# CONFIG_AT24 is not set 851# CONFIG_EEPROM_AT24 is not set
852CONFIG_SENSORS_EEPROM=y 852CONFIG_EEPROM_LEGACY=y
853# CONFIG_SENSORS_PCF8574 is not set 853# CONFIG_SENSORS_PCF8574 is not set
854# CONFIG_PCF8575 is not set 854# CONFIG_PCF8575 is not set
855# CONFIG_SENSORS_PCA9539 is not set 855# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig
index 597be8491812..ab5b0b58924c 100644
--- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8568mds_defconfig
@@ -723,8 +723,8 @@ CONFIG_I2C_MPC=y
723# Miscellaneous I2C Chip support 723# Miscellaneous I2C Chip support
724# 724#
725# CONFIG_DS1682 is not set 725# CONFIG_DS1682 is not set
726# CONFIG_AT24 is not set 726# CONFIG_EEPROM_AT24 is not set
727# CONFIG_SENSORS_EEPROM is not set 727# CONFIG_EEPROM_LEGACY is not set
728# CONFIG_SENSORS_PCF8574 is not set 728# CONFIG_SENSORS_PCF8574 is not set
729# CONFIG_PCF8575 is not set 729# CONFIG_PCF8575 is not set
730# CONFIG_SENSORS_PCA9539 is not set 730# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
index 32aeb79216f7..65ef823e08c6 100644
--- a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
@@ -861,8 +861,8 @@ CONFIG_I2C_MPC=y
861# Miscellaneous I2C Chip support 861# Miscellaneous I2C Chip support
862# 862#
863# CONFIG_DS1682 is not set 863# CONFIG_DS1682 is not set
864# CONFIG_AT24 is not set 864# CONFIG_EEPROM_AT24 is not set
865CONFIG_SENSORS_EEPROM=y 865CONFIG_EEPROM_LEGACY=y
866# CONFIG_SENSORS_PCF8574 is not set 866# CONFIG_SENSORS_PCF8574 is not set
867# CONFIG_PCF8575 is not set 867# CONFIG_PCF8575 is not set
868# CONFIG_SENSORS_PCA9539 is not set 868# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig
index 5a0cf58d2b8c..f1288a0c3040 100644
--- a/arch/powerpc/configs/85xx/stx_gp3_defconfig
+++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig
@@ -877,8 +877,8 @@ CONFIG_I2C_HELPER_AUTO=y
877# Miscellaneous I2C Chip support 877# Miscellaneous I2C Chip support
878# 878#
879# CONFIG_DS1682 is not set 879# CONFIG_DS1682 is not set
880# CONFIG_AT24 is not set 880# CONFIG_EEPROM_AT24 is not set
881# CONFIG_SENSORS_EEPROM is not set 881# CONFIG_EEPROM_LEGACY is not set
882# CONFIG_SENSORS_PCF8574 is not set 882# CONFIG_SENSORS_PCF8574 is not set
883# CONFIG_PCF8575 is not set 883# CONFIG_PCF8575 is not set
884# CONFIG_SENSORS_PCA9539 is not set 884# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig
index f3e4f3481fda..b3b1de6a6a85 100644
--- a/arch/powerpc/configs/85xx/tqm8540_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8540_defconfig
@@ -787,8 +787,8 @@ CONFIG_I2C_MPC=y
787# Miscellaneous I2C Chip support 787# Miscellaneous I2C Chip support
788# 788#
789# CONFIG_DS1682 is not set 789# CONFIG_DS1682 is not set
790# CONFIG_AT24 is not set 790# CONFIG_EEPROM_AT24 is not set
791# CONFIG_SENSORS_EEPROM is not set 791# CONFIG_EEPROM_LEGACY is not set
792# CONFIG_SENSORS_PCF8574 is not set 792# CONFIG_SENSORS_PCF8574 is not set
793# CONFIG_PCF8575 is not set 793# CONFIG_PCF8575 is not set
794# CONFIG_SENSORS_PCA9539 is not set 794# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig
index c62489394535..a92a639cdf8a 100644
--- a/arch/powerpc/configs/85xx/tqm8541_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8541_defconfig
@@ -796,8 +796,8 @@ CONFIG_I2C_MPC=y
796# Miscellaneous I2C Chip support 796# Miscellaneous I2C Chip support
797# 797#
798# CONFIG_DS1682 is not set 798# CONFIG_DS1682 is not set
799# CONFIG_AT24 is not set 799# CONFIG_EEPROM_AT24 is not set
800# CONFIG_SENSORS_EEPROM is not set 800# CONFIG_EEPROM_LEGACY is not set
801# CONFIG_SENSORS_PCF8574 is not set 801# CONFIG_SENSORS_PCF8574 is not set
802# CONFIG_PCF8575 is not set 802# CONFIG_PCF8575 is not set
803# CONFIG_SENSORS_PCA9539 is not set 803# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig
index eef45b97dc3e..397d37fbe7e3 100644
--- a/arch/powerpc/configs/85xx/tqm8548_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8548_defconfig
@@ -806,8 +806,8 @@ CONFIG_I2C_MPC=y
806# Miscellaneous I2C Chip support 806# Miscellaneous I2C Chip support
807# 807#
808# CONFIG_DS1682 is not set 808# CONFIG_DS1682 is not set
809# CONFIG_AT24 is not set 809# CONFIG_EEPROM_AT24 is not set
810# CONFIG_SENSORS_EEPROM is not set 810# CONFIG_EEPROM_LEGACY is not set
811# CONFIG_SENSORS_PCF8574 is not set 811# CONFIG_SENSORS_PCF8574 is not set
812# CONFIG_PCF8575 is not set 812# CONFIG_PCF8575 is not set
813# CONFIG_SENSORS_PCA9539 is not set 813# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig
index 11b637e99a54..856ca6ab37b7 100644
--- a/arch/powerpc/configs/85xx/tqm8555_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8555_defconfig
@@ -796,8 +796,8 @@ CONFIG_I2C_MPC=y
796# Miscellaneous I2C Chip support 796# Miscellaneous I2C Chip support
797# 797#
798# CONFIG_DS1682 is not set 798# CONFIG_DS1682 is not set
799# CONFIG_AT24 is not set 799# CONFIG_EEPROM_AT24 is not set
800# CONFIG_SENSORS_EEPROM is not set 800# CONFIG_EEPROM_LEGACY is not set
801# CONFIG_SENSORS_PCF8574 is not set 801# CONFIG_SENSORS_PCF8574 is not set
802# CONFIG_PCF8575 is not set 802# CONFIG_PCF8575 is not set
803# CONFIG_SENSORS_PCA9539 is not set 803# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig
index 2519169b6d4b..56ed4213609c 100644
--- a/arch/powerpc/configs/85xx/tqm8560_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8560_defconfig
@@ -796,8 +796,8 @@ CONFIG_I2C_MPC=y
796# Miscellaneous I2C Chip support 796# Miscellaneous I2C Chip support
797# 797#
798# CONFIG_DS1682 is not set 798# CONFIG_DS1682 is not set
799# CONFIG_AT24 is not set 799# CONFIG_EEPROM_AT24 is not set
800# CONFIG_SENSORS_EEPROM is not set 800# CONFIG_EEPROM_LEGACY is not set
801# CONFIG_SENSORS_PCF8574 is not set 801# CONFIG_SENSORS_PCF8574 is not set
802# CONFIG_PCF8575 is not set 802# CONFIG_PCF8575 is not set
803# CONFIG_SENSORS_PCA9539 is not set 803# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index 391874c7b436..840b09a07282 100644
--- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
@@ -1081,8 +1081,8 @@ CONFIG_I2C_MPC=y
1081# Miscellaneous I2C Chip support 1081# Miscellaneous I2C Chip support
1082# 1082#
1083CONFIG_DS1682=y 1083CONFIG_DS1682=y
1084# CONFIG_AT24 is not set 1084# CONFIG_EEPROM_AT24 is not set
1085# CONFIG_SENSORS_EEPROM is not set 1085# CONFIG_EEPROM_LEGACY is not set
1086# CONFIG_SENSORS_PCF8574 is not set 1086# CONFIG_SENSORS_PCF8574 is not set
1087# CONFIG_PCF8575 is not set 1087# CONFIG_PCF8575 is not set
1088# CONFIG_SENSORS_PCA9539 is not set 1088# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index 72854a10dfa1..25bf4e95acb8 100644
--- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
@@ -905,8 +905,8 @@ CONFIG_I2C_MPC=y
905# Miscellaneous I2C Chip support 905# Miscellaneous I2C Chip support
906# 906#
907# CONFIG_DS1682 is not set 907# CONFIG_DS1682 is not set
908# CONFIG_AT24 is not set 908# CONFIG_EEPROM_AT24 is not set
909# CONFIG_SENSORS_EEPROM is not set 909# CONFIG_EEPROM_LEGACY is not set
910# CONFIG_SENSORS_PCF8574 is not set 910# CONFIG_SENSORS_PCF8574 is not set
911# CONFIG_PCF8575 is not set 911# CONFIG_PCF8575 is not set
912# CONFIG_SENSORS_PCA9539 is not set 912# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
index 41220ece603d..8e0f0e5180a4 100644
--- a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
@@ -851,8 +851,8 @@ CONFIG_I2C_MPC=y
851# Miscellaneous I2C Chip support 851# Miscellaneous I2C Chip support
852# 852#
853# CONFIG_DS1682 is not set 853# CONFIG_DS1682 is not set
854# CONFIG_AT24 is not set 854# CONFIG_EEPROM_AT24 is not set
855CONFIG_SENSORS_EEPROM=y 855CONFIG_EEPROM_LEGACY=y
856# CONFIG_SENSORS_PCF8574 is not set 856# CONFIG_SENSORS_PCF8574 is not set
857# CONFIG_PCF8575 is not set 857# CONFIG_PCF8575 is not set
858# CONFIG_SENSORS_PCA9539 is not set 858# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig
index a4342862f6ef..37d9f4ed80f5 100644
--- a/arch/powerpc/configs/86xx/sbc8641d_defconfig
+++ b/arch/powerpc/configs/86xx/sbc8641d_defconfig
@@ -958,8 +958,8 @@ CONFIG_I2C_MPC=y
958# Miscellaneous I2C Chip support 958# Miscellaneous I2C Chip support
959# 959#
960# CONFIG_DS1682 is not set 960# CONFIG_DS1682 is not set
961# CONFIG_AT24 is not set 961# CONFIG_EEPROM_AT24 is not set
962# CONFIG_SENSORS_EEPROM is not set 962# CONFIG_EEPROM_LEGACY is not set
963# CONFIG_SENSORS_PCF8574 is not set 963# CONFIG_SENSORS_PCF8574 is not set
964# CONFIG_PCF8575 is not set 964# CONFIG_PCF8575 is not set
965# CONFIG_SENSORS_PCA9539 is not set 965# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index 5078594cd1f5..74c6feabdd77 100644
--- a/arch/powerpc/configs/c2k_defconfig
+++ b/arch/powerpc/configs/c2k_defconfig
@@ -1124,8 +1124,8 @@ CONFIG_I2C_MV64XXX=m
1124# Miscellaneous I2C Chip support 1124# Miscellaneous I2C Chip support
1125# 1125#
1126# CONFIG_DS1682 is not set 1126# CONFIG_DS1682 is not set
1127# CONFIG_AT24 is not set 1127# CONFIG_EEPROM_AT24 is not set
1128CONFIG_SENSORS_EEPROM=m 1128CONFIG_EEPROM_LEGACY=m
1129CONFIG_SENSORS_PCF8574=m 1129CONFIG_SENSORS_PCF8574=m
1130# CONFIG_PCF8575 is not set 1130# CONFIG_PCF8575 is not set
1131# CONFIG_SENSORS_PCA9539 is not set 1131# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index c420e47426f8..c6d2baa7aaeb 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1012,7 +1012,7 @@ CONFIG_I2C_ALGOBIT=y
1012# Miscellaneous I2C Chip support 1012# Miscellaneous I2C Chip support
1013# 1013#
1014# CONFIG_DS1682 is not set 1014# CONFIG_DS1682 is not set
1015# CONFIG_SENSORS_EEPROM is not set 1015# CONFIG_EEPROM_LEGACY is not set
1016# CONFIG_SENSORS_PCF8574 is not set 1016# CONFIG_SENSORS_PCF8574 is not set
1017# CONFIG_PCF8575 is not set 1017# CONFIG_PCF8575 is not set
1018# CONFIG_SENSORS_PCF8591 is not set 1018# CONFIG_SENSORS_PCF8591 is not set
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig
index 9ba3c6fc2fef..d2123779512a 100644
--- a/arch/powerpc/configs/celleb_defconfig
+++ b/arch/powerpc/configs/celleb_defconfig
@@ -834,7 +834,7 @@ CONFIG_I2C_ALGOBIT=y
834# Miscellaneous I2C Chip support 834# Miscellaneous I2C Chip support
835# 835#
836# CONFIG_DS1682 is not set 836# CONFIG_DS1682 is not set
837# CONFIG_SENSORS_EEPROM is not set 837# CONFIG_EEPROM_LEGACY is not set
838# CONFIG_SENSORS_PCF8574 is not set 838# CONFIG_SENSORS_PCF8574 is not set
839# CONFIG_PCF8575 is not set 839# CONFIG_PCF8575 is not set
840# CONFIG_SENSORS_PCF8591 is not set 840# CONFIG_SENSORS_PCF8591 is not set
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 63b3c2372ce8..5094a65a4493 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -941,8 +941,8 @@ CONFIG_I2C_ALGOBIT=y
941# Miscellaneous I2C Chip support 941# Miscellaneous I2C Chip support
942# 942#
943# CONFIG_DS1682 is not set 943# CONFIG_DS1682 is not set
944# CONFIG_AT24 is not set 944# CONFIG_EEPROM_AT24 is not set
945# CONFIG_SENSORS_EEPROM is not set 945# CONFIG_EEPROM_LEGACY is not set
946# CONFIG_SENSORS_PCF8574 is not set 946# CONFIG_SENSORS_PCF8574 is not set
947# CONFIG_PCF8575 is not set 947# CONFIG_PCF8575 is not set
948# CONFIG_SENSORS_PCA9539 is not set 948# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index f85e71ccb989..fc905924c022 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -994,8 +994,8 @@ CONFIG_I2C_POWERMAC=y
994# Miscellaneous I2C Chip support 994# Miscellaneous I2C Chip support
995# 995#
996# CONFIG_DS1682 is not set 996# CONFIG_DS1682 is not set
997# CONFIG_AT24 is not set 997# CONFIG_EEPROM_AT24 is not set
998# CONFIG_SENSORS_EEPROM is not set 998# CONFIG_EEPROM_LEGACY is not set
999# CONFIG_SENSORS_PCF8574 is not set 999# CONFIG_SENSORS_PCF8574 is not set
1000# CONFIG_PCF8575 is not set 1000# CONFIG_PCF8575 is not set
1001# CONFIG_SENSORS_PCA9539 is not set 1001# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 54fa62481373..3a0ffd73b65c 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_defconfig
@@ -1015,8 +1015,8 @@ CONFIG_I2C_MPC=y
1015# Miscellaneous I2C Chip support 1015# Miscellaneous I2C Chip support
1016# 1016#
1017# CONFIG_DS1682 is not set 1017# CONFIG_DS1682 is not set
1018# CONFIG_AT24 is not set 1018# CONFIG_EEPROM_AT24 is not set
1019CONFIG_SENSORS_EEPROM=m 1019CONFIG_EEPROM_LEGACY=m
1020# CONFIG_SENSORS_PCF8574 is not set 1020# CONFIG_SENSORS_PCF8574 is not set
1021# CONFIG_PCF8575 is not set 1021# CONFIG_PCF8575 is not set
1022# CONFIG_SENSORS_PCA9539 is not set 1022# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 045f1b008ce5..8b244003b9e1 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -866,8 +866,8 @@ CONFIG_I2C_AMD8111=y
866# Miscellaneous I2C Chip support 866# Miscellaneous I2C Chip support
867# 867#
868# CONFIG_DS1682 is not set 868# CONFIG_DS1682 is not set
869# CONFIG_AT24 is not set 869# CONFIG_EEPROM_AT24 is not set
870# CONFIG_SENSORS_EEPROM is not set 870# CONFIG_EEPROM_LEGACY is not set
871# CONFIG_SENSORS_PCF8574 is not set 871# CONFIG_SENSORS_PCF8574 is not set
872# CONFIG_PCF8575 is not set 872# CONFIG_PCF8575 is not set
873# CONFIG_SENSORS_PCA9539 is not set 873# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig
index 15c5604d0b26..5ff3de205d6a 100644
--- a/arch/powerpc/configs/mpc5200_defconfig
+++ b/arch/powerpc/configs/mpc5200_defconfig
@@ -844,8 +844,8 @@ CONFIG_I2C_MPC=y
844# Miscellaneous I2C Chip support 844# Miscellaneous I2C Chip support
845# 845#
846# CONFIG_DS1682 is not set 846# CONFIG_DS1682 is not set
847# CONFIG_AT24 is not set 847# CONFIG_EEPROM_AT24 is not set
848# CONFIG_SENSORS_EEPROM is not set 848# CONFIG_EEPROM_LEGACY is not set
849# CONFIG_SENSORS_PCF8574 is not set 849# CONFIG_SENSORS_PCF8574 is not set
850# CONFIG_PCF8575 is not set 850# CONFIG_PCF8575 is not set
851# CONFIG_SENSORS_PCA9539 is not set 851# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index d582014b0a38..3e1272cfdd91 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -902,8 +902,8 @@ CONFIG_I2C_MPC=y
902# Miscellaneous I2C Chip support 902# Miscellaneous I2C Chip support
903# 903#
904# CONFIG_DS1682 is not set 904# CONFIG_DS1682 is not set
905# CONFIG_AT24 is not set 905# CONFIG_EEPROM_AT24 is not set
906# CONFIG_SENSORS_EEPROM is not set 906# CONFIG_EEPROM_LEGACY is not set
907# CONFIG_SENSORS_PCF8574 is not set 907# CONFIG_SENSORS_PCF8574 is not set
908# CONFIG_PCF8575 is not set 908# CONFIG_PCF8575 is not set
909# CONFIG_SENSORS_PCA9539 is not set 909# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index c87b53abc617..55e5ebd91cd0 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -860,8 +860,8 @@ CONFIG_I2C_MPC=y
860# Miscellaneous I2C Chip support 860# Miscellaneous I2C Chip support
861# 861#
862# CONFIG_DS1682 is not set 862# CONFIG_DS1682 is not set
863# CONFIG_AT24 is not set 863# CONFIG_EEPROM_AT24 is not set
864CONFIG_SENSORS_EEPROM=y 864CONFIG_EEPROM_LEGACY=y
865# CONFIG_SENSORS_PCF8574 is not set 865# CONFIG_SENSORS_PCF8574 is not set
866# CONFIG_PCF8575 is not set 866# CONFIG_PCF8575 is not set
867# CONFIG_SENSORS_PCA9539 is not set 867# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig
index 1736bbc281ec..21e0ccbd3f5c 100644
--- a/arch/powerpc/configs/mpc86xx_defconfig
+++ b/arch/powerpc/configs/mpc86xx_defconfig
@@ -852,8 +852,8 @@ CONFIG_I2C_MPC=y
852# Miscellaneous I2C Chip support 852# Miscellaneous I2C Chip support
853# 853#
854# CONFIG_DS1682 is not set 854# CONFIG_DS1682 is not set
855# CONFIG_AT24 is not set 855# CONFIG_EEPROM_AT24 is not set
856CONFIG_SENSORS_EEPROM=y 856CONFIG_EEPROM_LEGACY=y
857# CONFIG_SENSORS_PCF8574 is not set 857# CONFIG_SENSORS_PCF8574 is not set
858# CONFIG_PCF8575 is not set 858# CONFIG_PCF8575 is not set
859# CONFIG_SENSORS_PCA9539 is not set 859# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 199e5f59d7a6..4f8681cc8d77 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -984,7 +984,7 @@ CONFIG_I2C_PASEMI=y
984# Miscellaneous I2C Chip support 984# Miscellaneous I2C Chip support
985# 985#
986# CONFIG_DS1682 is not set 986# CONFIG_DS1682 is not set
987CONFIG_SENSORS_EEPROM=y 987CONFIG_EEPROM_LEGACY=y
988# CONFIG_SENSORS_PCF8574 is not set 988# CONFIG_SENSORS_PCF8574 is not set
989# CONFIG_PCF8575 is not set 989# CONFIG_PCF8575 is not set
990# CONFIG_SENSORS_PCF8591 is not set 990# CONFIG_SENSORS_PCF8591 is not set
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index de9b121820a6..5339bb44cce9 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -1232,8 +1232,8 @@ CONFIG_I2C_POWERMAC=y
1232# Miscellaneous I2C Chip support 1232# Miscellaneous I2C Chip support
1233# 1233#
1234# CONFIG_DS1682 is not set 1234# CONFIG_DS1682 is not set
1235# CONFIG_AT24 is not set 1235# CONFIG_EEPROM_AT24 is not set
1236# CONFIG_SENSORS_EEPROM is not set 1236# CONFIG_EEPROM_LEGACY is not set
1237# CONFIG_SENSORS_PCF8574 is not set 1237# CONFIG_SENSORS_PCF8574 is not set
1238# CONFIG_PCF8575 is not set 1238# CONFIG_PCF8575 is not set
1239# CONFIG_SENSORS_PCA9539 is not set 1239# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig
index 4256e2c4534b..2d72ee7a8d60 100644
--- a/arch/powerpc/configs/ppc40x_defconfig
+++ b/arch/powerpc/configs/ppc40x_defconfig
@@ -745,8 +745,8 @@ CONFIG_I2C_IBM_IIC=m
745# Miscellaneous I2C Chip support 745# Miscellaneous I2C Chip support
746# 746#
747# CONFIG_DS1682 is not set 747# CONFIG_DS1682 is not set
748# CONFIG_AT24 is not set 748# CONFIG_EEPROM_AT24 is not set
749# CONFIG_SENSORS_EEPROM is not set 749# CONFIG_EEPROM_LEGACY is not set
750# CONFIG_SENSORS_PCF8574 is not set 750# CONFIG_SENSORS_PCF8574 is not set
751# CONFIG_PCF8575 is not set 751# CONFIG_PCF8575 is not set
752# CONFIG_SENSORS_PCA9539 is not set 752# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index 034a1fbdc887..358b85f9270e 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -794,8 +794,8 @@ CONFIG_I2C_IBM_IIC=m
794# Miscellaneous I2C Chip support 794# Miscellaneous I2C Chip support
795# 795#
796# CONFIG_DS1682 is not set 796# CONFIG_DS1682 is not set
797# CONFIG_AT24 is not set 797# CONFIG_EEPROM_AT24 is not set
798# CONFIG_SENSORS_EEPROM is not set 798# CONFIG_EEPROM_LEGACY is not set
799# CONFIG_SENSORS_PCF8574 is not set 799# CONFIG_SENSORS_PCF8574 is not set
800# CONFIG_PCF8575 is not set 800# CONFIG_PCF8575 is not set
801# CONFIG_SENSORS_PCA9539 is not set 801# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index d4685d1c0be8..88c6295b76c1 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1261,8 +1261,8 @@ CONFIG_I2C_PASEMI=y
1261# Miscellaneous I2C Chip support 1261# Miscellaneous I2C Chip support
1262# 1262#
1263# CONFIG_DS1682 is not set 1263# CONFIG_DS1682 is not set
1264# CONFIG_AT24 is not set 1264# CONFIG_EEPROM_AT24 is not set
1265# CONFIG_SENSORS_EEPROM is not set 1265# CONFIG_EEPROM_LEGACY is not set
1266# CONFIG_SENSORS_PCF8574 is not set 1266# CONFIG_SENSORS_PCF8574 is not set
1267# CONFIG_PCF8575 is not set 1267# CONFIG_PCF8575 is not set
1268# CONFIG_SENSORS_PCA9539 is not set 1268# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 01f05ec5abf3..7d044dfd9236 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -1801,8 +1801,8 @@ CONFIG_I2C_STUB=m
1801# Miscellaneous I2C Chip support 1801# Miscellaneous I2C Chip support
1802# 1802#
1803# CONFIG_DS1682 is not set 1803# CONFIG_DS1682 is not set
1804CONFIG_AT24=m 1804CONFIG_EEPROM_AT24=m
1805CONFIG_SENSORS_EEPROM=m 1805CONFIG_EEPROM_LEGACY=m
1806CONFIG_SENSORS_PCF8574=m 1806CONFIG_SENSORS_PCF8574=m
1807CONFIG_PCF8575=m 1807CONFIG_PCF8575=m
1808CONFIG_SENSORS_PCA9539=m 1808CONFIG_SENSORS_PCA9539=m
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index 6046dc0cbd82..a257da608081 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_defconfig
@@ -943,8 +943,8 @@ CONFIG_I2C_MV64XXX=y
943# Miscellaneous I2C Chip support 943# Miscellaneous I2C Chip support
944# 944#
945# CONFIG_DS1682 is not set 945# CONFIG_DS1682 is not set
946# CONFIG_AT24 is not set 946# CONFIG_EEPROM_AT24 is not set
947# CONFIG_SENSORS_EEPROM is not set 947# CONFIG_EEPROM_LEGACY is not set
948# CONFIG_SENSORS_PCF8574 is not set 948# CONFIG_SENSORS_PCF8574 is not set
949# CONFIG_PCF8575 is not set 949# CONFIG_PCF8575 is not set
950# CONFIG_SENSORS_PCA9539 is not set 950# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 1e520ab65118..61b100849715 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -1055,8 +1055,8 @@ CONFIG_I2C_ALGOBIT=y
1055# Miscellaneous I2C Chip support 1055# Miscellaneous I2C Chip support
1056# 1056#
1057# CONFIG_DS1682 is not set 1057# CONFIG_DS1682 is not set
1058# CONFIG_AT24 is not set 1058# CONFIG_EEPROM_AT24 is not set
1059# CONFIG_SENSORS_EEPROM is not set 1059# CONFIG_EEPROM_LEGACY is not set
1060# CONFIG_SENSORS_PCF8574 is not set 1060# CONFIG_SENSORS_PCF8574 is not set
1061# CONFIG_PCF8575 is not set 1061# CONFIG_PCF8575 is not set
1062# CONFIG_SENSORS_PCA9539 is not set 1062# CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig
index b3f5671972a9..7eb16ab7b71b 100644
--- a/arch/powerpc/configs/storcenter_defconfig
+++ b/arch/powerpc/configs/storcenter_defconfig
@@ -795,8 +795,8 @@ CONFIG_I2C_MPC=y
795# Miscellaneous I2C Chip support 795# Miscellaneous I2C Chip support
796# 796#
797# CONFIG_DS1682 is not set 797# CONFIG_DS1682 is not set
798# CONFIG_AT24 is not set 798# CONFIG_EEPROM_AT24 is not set
799# CONFIG_SENSORS_EEPROM is not set 799# CONFIG_EEPROM_LEGACY is not set
800# CONFIG_SENSORS_PCF8574 is not set 800# CONFIG_SENSORS_PCF8574 is not set
801# CONFIG_PCF8575 is not set 801# CONFIG_PCF8575 is not set
802# CONFIG_SENSORS_PCA9539 is not set 802# CONFIG_SENSORS_PCA9539 is not set