Merge branch 'linus' into core/percpu

Conflicts: arch/x86/kernel/setup_percpu.c
author: Ingo Molnar <mingo@elte.hu> 2009-01-27 06:01:51 -0500
committer: Ingo Molnar <mingo@elte.hu> 2009-01-27 06:01:51 -0500
commit: 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch)
tree: fc2efb59d627135ea2199a8a68415b162646b121 /arch/blackfin
parent: 5a611268b69f05262936dd177205acbce4471358 (diff)
parent: 5ee810072175042775e39bdd3eaaa68884c27805 (diff)
17 files changed, 36 insertions, 36 deletions
diff --git a/arch/blackfin/configs/BF518F-EZBRD_defconfig b/arch/blackfin/configs/BF518F-EZBRD_defconfig
index e0b3f242b555..defb9785c65b 100644
--- a/arch/blackfin/configs/BF518F-EZBRD_defconfig
+++ b/arch/blackfin/configs/BF518F-EZBRD_defconfig
@@ -746,9 +746,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
 # CONFIG_SENSORS_AD5252 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig
index 69f66c35b2a5..992424ff3153 100644
--- a/arch/blackfin/configs/BF526-EZBRD_defconfig
+++ b/arch/blackfin/configs/BF526-EZBRD_defconfig
@@ -793,9 +793,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
 # CONFIG_SENSORS_AD5252 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
@@ -820,7 +820,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig
index f92668af00b0..21e3c1af55ba 100644
--- a/arch/blackfin/configs/BF527-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF527-EZKIT_defconfig
@@ -837,9 +837,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
 # CONFIG_SENSORS_AD5252 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
@@ -864,7 +864,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig
index 92afd988449b..0bdf20a1af61 100644
--- a/arch/blackfin/configs/BF533-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF533-EZKIT_defconfig
@@ -719,7 +719,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig
index 49eabb41e9e5..2f747d6e97e2 100644
--- a/arch/blackfin/configs/BF533-STAMP_defconfig
+++ b/arch/blackfin/configs/BF533-STAMP_defconfig
@@ -743,9 +743,9 @@ CONFIG_I2C_HELPER_AUTO=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
 # CONFIG_SENSORS_AD5252 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
@@ -770,7 +770,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig
index 332142f7f9b4..8b0a81294e65 100644
--- a/arch/blackfin/configs/BF537-STAMP_defconfig
+++ b/arch/blackfin/configs/BF537-STAMP_defconfig
@@ -794,9 +794,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
 CONFIG_SENSORS_AD5252=m
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
@@ -821,7 +821,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/blackfin/configs/BF538-EZKIT_defconfig b/arch/blackfin/configs/BF538-EZKIT_defconfig
index ed15934c67c2..a1f766bf7d9b 100644
--- a/arch/blackfin/configs/BF538-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF538-EZKIT_defconfig
@@ -796,9 +796,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
 # CONFIG_SENSORS_AD5252 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
@@ -823,7 +823,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig
index d4ed9ce1f62f..cd2da6b7692c 100644
--- a/arch/blackfin/configs/BF548-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF548-EZKIT_defconfig
@@ -928,9 +928,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
 # CONFIG_SENSORS_AD5252 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
@@ -955,7 +955,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig
index 1ecb7a38c905..b398ca202dbd 100644
--- a/arch/blackfin/configs/BF561-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF561-EZKIT_defconfig
@@ -756,7 +756,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig
index 9683b2e13097..3a20e281d23c 100644
--- a/arch/blackfin/configs/BlackStamp_defconfig
+++ b/arch/blackfin/configs/BlackStamp_defconfig
@@ -691,7 +691,7 @@ CONFIG_I2C_GPIO=m
 #
 # CONFIG_DS1682 is not set
 # CONFIG_SENSORS_AD5252 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCF8591 is not set
@@ -713,7 +713,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-CONFIG_SPI_AT25=y
+CONFIG_EEPROM_AT25=y
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig
index a041e7eba770..95146948166f 100644
--- a/arch/blackfin/configs/CM-BF527_defconfig
+++ b/arch/blackfin/configs/CM-BF527_defconfig
@@ -715,7 +715,7 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 # CONFIG_SENSORS_DS1374 is not set
 # CONFIG_DS1682 is not set
 # CONFIG_SENSORS_AD5252 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
@@ -742,7 +742,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig
index efd68bc78f35..efe9741b1f14 100644
--- a/arch/blackfin/configs/CM-BF548_defconfig
+++ b/arch/blackfin/configs/CM-BF548_defconfig
@@ -798,7 +798,7 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 # CONFIG_SENSORS_DS1374 is not set
 # CONFIG_DS1682 is not set
 # CONFIG_SENSORS_AD5252 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCF8575 is not set
 # CONFIG_SENSORS_PCA9543 is not set
@@ -826,7 +826,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
diff --git a/arch/blackfin/configs/H8606_defconfig b/arch/blackfin/configs/H8606_defconfig
index 5d3901d23fd1..bd553da15db8 100644
--- a/arch/blackfin/configs/H8606_defconfig
+++ b/arch/blackfin/configs/H8606_defconfig
@@ -750,7 +750,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-CONFIG_SPI_AT25=y
+CONFIG_EEPROM_AT25=y
 CONFIG_SPI_SPIDEV=y
 #
diff --git a/arch/blackfin/configs/IP0X_defconfig b/arch/blackfin/configs/IP0X_defconfig
index e66f5daaa828..eae83b5de92f 100644
--- a/arch/blackfin/configs/IP0X_defconfig
+++ b/arch/blackfin/configs/IP0X_defconfig
@@ -803,7 +803,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 #
diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig
index ce5dde9de9db..ad096702ac16 100644
--- a/arch/blackfin/configs/PNAV-10_defconfig
+++ b/arch/blackfin/configs/PNAV-10_defconfig
@@ -755,9 +755,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
 # CONFIG_SENSORS_AD5252 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 CONFIG_SENSORS_PCF8574=m
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
@@ -781,7 +781,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
diff --git a/arch/blackfin/configs/SRV1_defconfig b/arch/blackfin/configs/SRV1_defconfig
index 7c8250d6fa66..fa580affc9d6 100644
--- a/arch/blackfin/configs/SRV1_defconfig
+++ b/arch/blackfin/configs/SRV1_defconfig
@@ -798,7 +798,7 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
 # CONFIG_SENSORS_AD5252 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCF8575 is not set
 # CONFIG_SENSORS_PCA9543 is not set
@@ -826,7 +826,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-CONFIG_SPI_AT25=m
+CONFIG_EEPROM_AT25=m
 # CONFIG_SPI_SPIDEV is not set
 #
diff --git a/arch/blackfin/configs/TCM-BF537_defconfig b/arch/blackfin/configs/TCM-BF537_defconfig
index 9af522c7dadf..97a1f1d20dcf 100644
--- a/arch/blackfin/configs/TCM-BF537_defconfig
+++ b/arch/blackfin/configs/TCM-BF537_defconfig
@@ -533,7 +533,7 @@ CONFIG_SPI_BFIN=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
author	Ingo Molnar <mingo@elte.hu>	2009-01-27 06:01:51 -0500
committer	Ingo Molnar <mingo@elte.hu>	2009-01-27 06:01:51 -0500
commit	3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch)
tree	fc2efb59d627135ea2199a8a68415b162646b121 /arch/blackfin
parent	5a611268b69f05262936dd177205acbce4471358 (diff)
parent	5ee810072175042775e39bdd3eaaa68884c27805 (diff)

diff --git a/arch/blackfin/configs/BF518F-EZBRD_defconfig b/arch/blackfin/configs/BF518F-EZBRD_defconfig index e0b3f242b555..defb9785c65b 100644 --- a/arch/blackfin/configs/BF518F-EZBRD_defconfig +++ b/arch/blackfin/configs/BF518F-EZBRD_defconfig
@@ -746,9 +746,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
746	# Miscellaneous I2C Chip support	746	# Miscellaneous I2C Chip support
747	#	747	#
748	# CONFIG_DS1682 is not set	748	# CONFIG_DS1682 is not set
749	# CONFIG_AT24 is not set	749	# CONFIG_EEPROM_AT24 is not set
750	# CONFIG_SENSORS_AD5252 is not set	750	# CONFIG_SENSORS_AD5252 is not set
751	# CONFIG_SENSORS_EEPROM is not set	751	# CONFIG_EEPROM_LEGACY is not set
752	# CONFIG_SENSORS_PCF8574 is not set	752	# CONFIG_SENSORS_PCF8574 is not set
753	# CONFIG_PCF8575 is not set	753	# CONFIG_PCF8575 is not set
754	# CONFIG_SENSORS_PCA9539 is not set	754	# CONFIG_SENSORS_PCA9539 is not set


diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig index 69f66c35b2a5..992424ff3153 100644 --- a/arch/blackfin/configs/BF526-EZBRD_defconfig +++ b/arch/blackfin/configs/BF526-EZBRD_defconfig
@@ -793,9 +793,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
793	# Miscellaneous I2C Chip support	793	# Miscellaneous I2C Chip support
794	#	794	#
795	# CONFIG_DS1682 is not set	795	# CONFIG_DS1682 is not set
796	# CONFIG_AT24 is not set	796	# CONFIG_EEPROM_AT24 is not set
797	# CONFIG_SENSORS_AD5252 is not set	797	# CONFIG_SENSORS_AD5252 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
@@ -820,7 +820,7 @@ CONFIG_SPI_BFIN=y
820	#	820	#
821	# SPI Protocol Masters	821	# SPI Protocol Masters
822	#	822	#
823	# CONFIG_SPI_AT25 is not set	823	# CONFIG_EEPROM_AT25 is not set
824	# CONFIG_SPI_SPIDEV is not set	824	# CONFIG_SPI_SPIDEV is not set
825	# CONFIG_SPI_TLE62X0 is not set	825	# CONFIG_SPI_TLE62X0 is not set
826	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y	826	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y


diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig index f92668af00b0..21e3c1af55ba 100644 --- a/arch/blackfin/configs/BF527-EZKIT_defconfig +++ b/arch/blackfin/configs/BF527-EZKIT_defconfig
@@ -837,9 +837,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
837	# Miscellaneous I2C Chip support	837	# Miscellaneous I2C Chip support
838	#	838	#
839	# CONFIG_DS1682 is not set	839	# CONFIG_DS1682 is not set
840	# CONFIG_AT24 is not set	840	# CONFIG_EEPROM_AT24 is not set
841	# CONFIG_SENSORS_AD5252 is not set	841	# CONFIG_SENSORS_AD5252 is not set
842	# CONFIG_SENSORS_EEPROM is not set	842	# CONFIG_EEPROM_LEGACY is not set
843	# CONFIG_SENSORS_PCF8574 is not set	843	# CONFIG_SENSORS_PCF8574 is not set
844	# CONFIG_PCF8575 is not set	844	# CONFIG_PCF8575 is not set
845	# CONFIG_SENSORS_PCA9539 is not set	845	# CONFIG_SENSORS_PCA9539 is not set
@@ -864,7 +864,7 @@ CONFIG_SPI_BFIN=y
864	#	864	#
865	# SPI Protocol Masters	865	# SPI Protocol Masters
866	#	866	#
867	# CONFIG_SPI_AT25 is not set	867	# CONFIG_EEPROM_AT25 is not set
868	# CONFIG_SPI_SPIDEV is not set	868	# CONFIG_SPI_SPIDEV is not set
869	# CONFIG_SPI_TLE62X0 is not set	869	# CONFIG_SPI_TLE62X0 is not set
870	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y	870	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y


diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig index 92afd988449b..0bdf20a1af61 100644 --- a/arch/blackfin/configs/BF533-EZKIT_defconfig +++ b/arch/blackfin/configs/BF533-EZKIT_defconfig
@@ -719,7 +719,7 @@ CONFIG_SPI_BFIN=y
719	#	719	#
720	# SPI Protocol Masters	720	# SPI Protocol Masters
721	#	721	#
722	# CONFIG_SPI_AT25 is not set	722	# CONFIG_EEPROM_AT25 is not set
723	# CONFIG_SPI_SPIDEV is not set	723	# CONFIG_SPI_SPIDEV is not set
724	# CONFIG_SPI_TLE62X0 is not set	724	# CONFIG_SPI_TLE62X0 is not set
725	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y	725	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y


diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig index 49eabb41e9e5..2f747d6e97e2 100644 --- a/arch/blackfin/configs/BF533-STAMP_defconfig +++ b/arch/blackfin/configs/BF533-STAMP_defconfig
@@ -743,9 +743,9 @@ CONFIG_I2C_HELPER_AUTO=y
743	# Miscellaneous I2C Chip support	743	# Miscellaneous I2C Chip support
744	#	744	#
745	# CONFIG_DS1682 is not set	745	# CONFIG_DS1682 is not set
746	# CONFIG_AT24 is not set	746	# CONFIG_EEPROM_AT24 is not set
747	# CONFIG_SENSORS_AD5252 is not set	747	# CONFIG_SENSORS_AD5252 is not set
748	# CONFIG_SENSORS_EEPROM is not set	748	# CONFIG_EEPROM_LEGACY is not set
749	# CONFIG_SENSORS_PCF8574 is not set	749	# CONFIG_SENSORS_PCF8574 is not set
750	# CONFIG_PCF8575 is not set	750	# CONFIG_PCF8575 is not set
751	# CONFIG_SENSORS_PCA9539 is not set	751	# CONFIG_SENSORS_PCA9539 is not set
@@ -770,7 +770,7 @@ CONFIG_SPI_BFIN=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
776	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y	776	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y


diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig index 332142f7f9b4..8b0a81294e65 100644 --- a/arch/blackfin/configs/BF537-STAMP_defconfig +++ b/arch/blackfin/configs/BF537-STAMP_defconfig
@@ -794,9 +794,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
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_AD5252=m	798	CONFIG_SENSORS_AD5252=m
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
@@ -821,7 +821,7 @@ CONFIG_SPI_BFIN=y
821	#	821	#
822	# SPI Protocol Masters	822	# SPI Protocol Masters
823	#	823	#
824	# CONFIG_SPI_AT25 is not set	824	# CONFIG_EEPROM_AT25 is not set
825	# CONFIG_SPI_SPIDEV is not set	825	# CONFIG_SPI_SPIDEV is not set
826	# CONFIG_SPI_TLE62X0 is not set	826	# CONFIG_SPI_TLE62X0 is not set
827	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y	827	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y


diff --git a/arch/blackfin/configs/BF538-EZKIT_defconfig b/arch/blackfin/configs/BF538-EZKIT_defconfig index ed15934c67c2..a1f766bf7d9b 100644 --- a/arch/blackfin/configs/BF538-EZKIT_defconfig +++ b/arch/blackfin/configs/BF538-EZKIT_defconfig
@@ -796,9 +796,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
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_AD5252 is not set	800	# CONFIG_SENSORS_AD5252 is not set
801	# CONFIG_SENSORS_EEPROM is not set	801	# CONFIG_EEPROM_LEGACY is not set
802	# CONFIG_SENSORS_PCF8574 is not set	802	# CONFIG_SENSORS_PCF8574 is not set
803	# CONFIG_PCF8575 is not set	803	# CONFIG_PCF8575 is not set
804	# CONFIG_SENSORS_PCA9539 is not set	804	# CONFIG_SENSORS_PCA9539 is not set
@@ -823,7 +823,7 @@ CONFIG_SPI_BFIN=y
823	#	823	#
824	# SPI Protocol Masters	824	# SPI Protocol Masters
825	#	825	#
826	# CONFIG_SPI_AT25 is not set	826	# CONFIG_EEPROM_AT25 is not set
827	# CONFIG_SPI_SPIDEV is not set	827	# CONFIG_SPI_SPIDEV is not set
828	# CONFIG_SPI_TLE62X0 is not set	828	# CONFIG_SPI_TLE62X0 is not set
829	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y	829	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y


diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig index d4ed9ce1f62f..cd2da6b7692c 100644 --- a/arch/blackfin/configs/BF548-EZKIT_defconfig +++ b/arch/blackfin/configs/BF548-EZKIT_defconfig
@@ -928,9 +928,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
928	# Miscellaneous I2C Chip support	928	# Miscellaneous I2C Chip support
929	#	929	#
930	# CONFIG_DS1682 is not set	930	# CONFIG_DS1682 is not set
931	# CONFIG_AT24 is not set	931	# CONFIG_EEPROM_AT24 is not set
932	# CONFIG_SENSORS_AD5252 is not set	932	# CONFIG_SENSORS_AD5252 is not set
933	# CONFIG_SENSORS_EEPROM is not set	933	# CONFIG_EEPROM_LEGACY is not set
934	# CONFIG_SENSORS_PCF8574 is not set	934	# CONFIG_SENSORS_PCF8574 is not set
935	# CONFIG_PCF8575 is not set	935	# CONFIG_PCF8575 is not set
936	# CONFIG_SENSORS_PCA9539 is not set	936	# CONFIG_SENSORS_PCA9539 is not set
@@ -955,7 +955,7 @@ CONFIG_SPI_BFIN=y
955	#	955	#
956	# SPI Protocol Masters	956	# SPI Protocol Masters
957	#	957	#
958	# CONFIG_SPI_AT25 is not set	958	# CONFIG_EEPROM_AT25 is not set
959	# CONFIG_SPI_SPIDEV is not set	959	# CONFIG_SPI_SPIDEV is not set
960	# CONFIG_SPI_TLE62X0 is not set	960	# CONFIG_SPI_TLE62X0 is not set
961	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y	961	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y


diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig index 1ecb7a38c905..b398ca202dbd 100644 --- a/arch/blackfin/configs/BF561-EZKIT_defconfig +++ b/arch/blackfin/configs/BF561-EZKIT_defconfig
@@ -756,7 +756,7 @@ CONFIG_SPI_BFIN=y
756	#	756	#
757	# SPI Protocol Masters	757	# SPI Protocol Masters
758	#	758	#
759	# CONFIG_SPI_AT25 is not set	759	# CONFIG_EEPROM_AT25 is not set
760	# CONFIG_SPI_SPIDEV is not set	760	# CONFIG_SPI_SPIDEV is not set
761	# CONFIG_SPI_TLE62X0 is not set	761	# CONFIG_SPI_TLE62X0 is not set
762	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y	762	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y


diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig index 9683b2e13097..3a20e281d23c 100644 --- a/arch/blackfin/configs/BlackStamp_defconfig +++ b/arch/blackfin/configs/BlackStamp_defconfig
@@ -691,7 +691,7 @@ CONFIG_I2C_GPIO=m
691	#	691	#
692	# CONFIG_DS1682 is not set	692	# CONFIG_DS1682 is not set
693	# CONFIG_SENSORS_AD5252 is not set	693	# CONFIG_SENSORS_AD5252 is not set
694	# CONFIG_SENSORS_EEPROM is not set	694	# CONFIG_EEPROM_LEGACY is not set
695	# CONFIG_SENSORS_PCF8574 is not set	695	# CONFIG_SENSORS_PCF8574 is not set
696	# CONFIG_PCF8575 is not set	696	# CONFIG_PCF8575 is not set
697	# CONFIG_SENSORS_PCF8591 is not set	697	# CONFIG_SENSORS_PCF8591 is not set
@@ -713,7 +713,7 @@ CONFIG_SPI_BFIN=y
713	#	713	#
714	# SPI Protocol Masters	714	# SPI Protocol Masters
715	#	715	#
716	CONFIG_SPI_AT25=y	716	CONFIG_EEPROM_AT25=y
717	CONFIG_SPI_SPIDEV=m	717	CONFIG_SPI_SPIDEV=m
718	# CONFIG_SPI_TLE62X0 is not set	718	# CONFIG_SPI_TLE62X0 is not set
719	# CONFIG_W1 is not set	719	# CONFIG_W1 is not set


diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig index a041e7eba770..95146948166f 100644 --- a/arch/blackfin/configs/CM-BF527_defconfig +++ b/arch/blackfin/configs/CM-BF527_defconfig
@@ -715,7 +715,7 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
715	# CONFIG_SENSORS_DS1374 is not set	715	# CONFIG_SENSORS_DS1374 is not set
716	# CONFIG_DS1682 is not set	716	# CONFIG_DS1682 is not set
717	# CONFIG_SENSORS_AD5252 is not set	717	# CONFIG_SENSORS_AD5252 is not set
718	# CONFIG_SENSORS_EEPROM is not set	718	# CONFIG_EEPROM_LEGACY is not set
719	# CONFIG_SENSORS_PCF8574 is not set	719	# CONFIG_SENSORS_PCF8574 is not set
720	# CONFIG_SENSORS_PCF8575 is not set	720	# CONFIG_SENSORS_PCF8575 is not set
721	# CONFIG_SENSORS_PCA9539 is not set	721	# CONFIG_SENSORS_PCA9539 is not set
@@ -742,7 +742,7 @@ CONFIG_SPI_BFIN=y
742	#	742	#
743	# SPI Protocol Masters	743	# SPI Protocol Masters
744	#	744	#
745	# CONFIG_SPI_AT25 is not set	745	# CONFIG_EEPROM_AT25 is not set
746	# CONFIG_SPI_SPIDEV is not set	746	# CONFIG_SPI_SPIDEV is not set
747	# CONFIG_SPI_TLE62X0 is not set	747	# CONFIG_SPI_TLE62X0 is not set
748	# CONFIG_W1 is not set	748	# CONFIG_W1 is not set


diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig index efd68bc78f35..efe9741b1f14 100644 --- a/arch/blackfin/configs/CM-BF548_defconfig +++ b/arch/blackfin/configs/CM-BF548_defconfig
@@ -798,7 +798,7 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
798	# CONFIG_SENSORS_DS1374 is not set	798	# CONFIG_SENSORS_DS1374 is not set
799	# CONFIG_DS1682 is not set	799	# CONFIG_DS1682 is not set
800	# CONFIG_SENSORS_AD5252 is not set	800	# CONFIG_SENSORS_AD5252 is not set
801	# CONFIG_SENSORS_EEPROM is not set	801	# CONFIG_EEPROM_LEGACY is not set
802	# CONFIG_SENSORS_PCF8574 is not set	802	# CONFIG_SENSORS_PCF8574 is not set
803	# CONFIG_SENSORS_PCF8575 is not set	803	# CONFIG_SENSORS_PCF8575 is not set
804	# CONFIG_SENSORS_PCA9543 is not set	804	# CONFIG_SENSORS_PCA9543 is not set
@@ -826,7 +826,7 @@ CONFIG_SPI_BFIN=y
826	#	826	#
827	# SPI Protocol Masters	827	# SPI Protocol Masters
828	#	828	#
829	# CONFIG_SPI_AT25 is not set	829	# CONFIG_EEPROM_AT25 is not set
830	# CONFIG_SPI_SPIDEV is not set	830	# CONFIG_SPI_SPIDEV is not set
831	# CONFIG_SPI_TLE62X0 is not set	831	# CONFIG_SPI_TLE62X0 is not set
832	# CONFIG_W1 is not set	832	# CONFIG_W1 is not set


diff --git a/arch/blackfin/configs/H8606_defconfig b/arch/blackfin/configs/H8606_defconfig index 5d3901d23fd1..bd553da15db8 100644 --- a/arch/blackfin/configs/H8606_defconfig +++ b/arch/blackfin/configs/H8606_defconfig
@@ -750,7 +750,7 @@ CONFIG_SPI_BFIN=y
750	#	750	#
751	# SPI Protocol Masters	751	# SPI Protocol Masters
752	#	752	#
753	CONFIG_SPI_AT25=y	753	CONFIG_EEPROM_AT25=y
754	CONFIG_SPI_SPIDEV=y	754	CONFIG_SPI_SPIDEV=y
755		755
756	#	756	#


diff --git a/arch/blackfin/configs/IP0X_defconfig b/arch/blackfin/configs/IP0X_defconfig index e66f5daaa828..eae83b5de92f 100644 --- a/arch/blackfin/configs/IP0X_defconfig +++ b/arch/blackfin/configs/IP0X_defconfig
@@ -803,7 +803,7 @@ CONFIG_SPI_BFIN=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		808
809	#	809	#


diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig index ce5dde9de9db..ad096702ac16 100644 --- a/arch/blackfin/configs/PNAV-10_defconfig +++ b/arch/blackfin/configs/PNAV-10_defconfig
@@ -755,9 +755,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
755	# Miscellaneous I2C Chip support	755	# Miscellaneous I2C Chip support
756	#	756	#
757	# CONFIG_DS1682 is not set	757	# CONFIG_DS1682 is not set
758	# CONFIG_AT24 is not set	758	# CONFIG_EEPROM_AT24 is not set
759	# CONFIG_SENSORS_AD5252 is not set	759	# CONFIG_SENSORS_AD5252 is not set
760	# CONFIG_SENSORS_EEPROM is not set	760	# CONFIG_EEPROM_LEGACY is not set
761	CONFIG_SENSORS_PCF8574=m	761	CONFIG_SENSORS_PCF8574=m
762	# CONFIG_PCF8575 is not set	762	# CONFIG_PCF8575 is not set
763	# CONFIG_SENSORS_PCA9539 is not set	763	# CONFIG_SENSORS_PCA9539 is not set
@@ -781,7 +781,7 @@ CONFIG_SPI_BFIN=y
781	#	781	#
782	# SPI Protocol Masters	782	# SPI Protocol Masters
783	#	783	#
784	# CONFIG_SPI_AT25 is not set	784	# CONFIG_EEPROM_AT25 is not set
785	# CONFIG_SPI_SPIDEV is not set	785	# CONFIG_SPI_SPIDEV is not set
786	# CONFIG_SPI_TLE62X0 is not set	786	# CONFIG_SPI_TLE62X0 is not set
787	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y	787	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y


diff --git a/arch/blackfin/configs/SRV1_defconfig b/arch/blackfin/configs/SRV1_defconfig index 7c8250d6fa66..fa580affc9d6 100644 --- a/arch/blackfin/configs/SRV1_defconfig +++ b/arch/blackfin/configs/SRV1_defconfig
@@ -798,7 +798,7 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
798	# CONFIG_SENSORS_DS1337 is not set	798	# CONFIG_SENSORS_DS1337 is not set
799	# CONFIG_SENSORS_DS1374 is not set	799	# CONFIG_SENSORS_DS1374 is not set
800	# CONFIG_SENSORS_AD5252 is not set	800	# CONFIG_SENSORS_AD5252 is not set
801	# CONFIG_SENSORS_EEPROM is not set	801	# CONFIG_EEPROM_LEGACY is not set
802	# CONFIG_SENSORS_PCF8574 is not set	802	# CONFIG_SENSORS_PCF8574 is not set
803	# CONFIG_SENSORS_PCF8575 is not set	803	# CONFIG_SENSORS_PCF8575 is not set
804	# CONFIG_SENSORS_PCA9543 is not set	804	# CONFIG_SENSORS_PCA9543 is not set
@@ -826,7 +826,7 @@ CONFIG_SPI_BFIN=y
826	#	826	#
827	# SPI Protocol Masters	827	# SPI Protocol Masters
828	#	828	#
829	CONFIG_SPI_AT25=m	829	CONFIG_EEPROM_AT25=m
830	# CONFIG_SPI_SPIDEV is not set	830	# CONFIG_SPI_SPIDEV is not set
831		831
832	#	832	#


diff --git a/arch/blackfin/configs/TCM-BF537_defconfig b/arch/blackfin/configs/TCM-BF537_defconfig index 9af522c7dadf..97a1f1d20dcf 100644 --- a/arch/blackfin/configs/TCM-BF537_defconfig +++ b/arch/blackfin/configs/TCM-BF537_defconfig
@@ -533,7 +533,7 @@ CONFIG_SPI_BFIN=y
533	#	533	#
534	# SPI Protocol Masters	534	# SPI Protocol Masters
535	#	535	#
536	# CONFIG_SPI_AT25 is not set	536	# CONFIG_EEPROM_AT25 is not set
537	# CONFIG_SPI_SPIDEV is not set	537	# CONFIG_SPI_SPIDEV is not set
538	# CONFIG_SPI_TLE62X0 is not set	538	# CONFIG_SPI_TLE62X0 is not set
539	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y	539	CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y