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/avr32/configs
parent: 5a611268b69f05262936dd177205acbce4471358 (diff)
parent: 5ee810072175042775e39bdd3eaaa68884c27805 (diff)
10 files changed, 26 insertions, 26 deletions
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig
index 164e2814ae78..574aca975334 100644
--- a/arch/avr32/configs/atngw100_defconfig
+++ b/arch/avr32/configs/atngw100_defconfig
@@ -644,8 +644,8 @@ CONFIG_I2C_GPIO=m
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-CONFIG_AT24=m
+CONFIG_EEPROM_AT24=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
@@ -670,7 +670,7 @@ CONFIG_SPI_ATMEL=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig
index b0572d213826..86a45b5c9d0d 100644
--- a/arch/avr32/configs/atngw100_evklcd100_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd100_defconfig
@@ -671,7 +671,7 @@ CONFIG_I2C_GPIO=m
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 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
@@ -699,7 +699,7 @@ CONFIG_SPI_ATMEL=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_HAVE_GPIO_LIB=y
diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig
index c5b898d21075..a96b68ea5e83 100644
--- a/arch/avr32/configs/atngw100_evklcd101_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd101_defconfig
@@ -671,7 +671,7 @@ CONFIG_I2C_GPIO=m
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 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
@@ -699,7 +699,7 @@ CONFIG_SPI_ATMEL=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_HAVE_GPIO_LIB=y
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig
index c9dc64832a19..0abe90adb1a4 100644
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
@@ -663,8 +663,8 @@ CONFIG_I2C_GPIO=m
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-CONFIG_AT24=m
+CONFIG_EEPROM_AT24=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
@@ -689,7 +689,7 @@ CONFIG_SPI_ATMEL=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig
index 29ea1327b498..101972f40f07 100644
--- a/arch/avr32/configs/atstk1003_defconfig
+++ b/arch/avr32/configs/atstk1003_defconfig
@@ -611,8 +611,8 @@ CONFIG_I2C_GPIO=m
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-CONFIG_AT24=m
+CONFIG_EEPROM_AT24=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
@@ -637,7 +637,7 @@ CONFIG_SPI_ATMEL=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig
index 69e6c0d08ce8..518f7898df75 100644
--- a/arch/avr32/configs/atstk1004_defconfig
+++ b/arch/avr32/configs/atstk1004_defconfig
@@ -394,7 +394,7 @@ CONFIG_SPI_ATMEL=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_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig
index 361c31c2af10..c1603c4860e0 100644
--- a/arch/avr32/configs/atstk1006_defconfig
+++ b/arch/avr32/configs/atstk1006_defconfig
@@ -684,8 +684,8 @@ CONFIG_I2C_GPIO=m
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 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
@@ -710,7 +710,7 @@ CONFIG_SPI_ATMEL=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig
index e2bd9982e2af..4c3ac0643e4a 100644
--- a/arch/avr32/configs/favr-32_defconfig
+++ b/arch/avr32/configs/favr-32_defconfig
@@ -633,8 +633,8 @@ CONFIG_I2C_GPIO=m
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 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
@@ -659,7 +659,7 @@ CONFIG_SPI_ATMEL=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/hammerhead_defconfig b/arch/avr32/configs/hammerhead_defconfig
index 0d3d2982c8f5..3970fcc4d76e 100644
--- a/arch/avr32/configs/hammerhead_defconfig
+++ b/arch/avr32/configs/hammerhead_defconfig
@@ -716,8 +716,8 @@ CONFIG_I2C_GPIO=m
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 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
@@ -742,7 +742,7 @@ CONFIG_SPI_ATMEL=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/mimc200_defconfig b/arch/avr32/configs/mimc200_defconfig
index 981e4f8b8aeb..1a58ffbc752d 100644
--- a/arch/avr32/configs/mimc200_defconfig
+++ b/arch/avr32/configs/mimc200_defconfig
@@ -565,8 +565,8 @@ CONFIG_I2C_GPIO=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-CONFIG_AT24=y
+CONFIG_EEPROM_AT24=y
-# 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
@@ -592,7 +592,7 @@ CONFIG_SPI_ATMEL=y
 #
 # SPI Protocol Masters
 #
-CONFIG_SPI_AT25=y
+CONFIG_EEPROM_AT25=y
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_ARCH_REQUIRE_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/avr32/configs
parent	5a611268b69f05262936dd177205acbce4471358 (diff)
parent	5ee810072175042775e39bdd3eaaa68884c27805 (diff)

diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig index 164e2814ae78..574aca975334 100644 --- a/arch/avr32/configs/atngw100_defconfig +++ b/arch/avr32/configs/atngw100_defconfig
@@ -644,8 +644,8 @@ CONFIG_I2C_GPIO=m
644	# Miscellaneous I2C Chip support	644	# Miscellaneous I2C Chip support
645	#	645	#
646	# CONFIG_DS1682 is not set	646	# CONFIG_DS1682 is not set
647	CONFIG_AT24=m	647	CONFIG_EEPROM_AT24=m
648	# CONFIG_SENSORS_EEPROM is not set	648	# CONFIG_EEPROM_LEGACY is not set
649	# CONFIG_SENSORS_PCF8574 is not set	649	# CONFIG_SENSORS_PCF8574 is not set
650	# CONFIG_PCF8575 is not set	650	# CONFIG_PCF8575 is not set
651	# CONFIG_SENSORS_PCA9539 is not set	651	# CONFIG_SENSORS_PCA9539 is not set
@@ -670,7 +670,7 @@ CONFIG_SPI_ATMEL=y
670	#	670	#
671	# SPI Protocol Masters	671	# SPI Protocol Masters
672	#	672	#
673	# CONFIG_SPI_AT25 is not set	673	# CONFIG_EEPROM_AT25 is not set
674	CONFIG_SPI_SPIDEV=m	674	CONFIG_SPI_SPIDEV=m
675	# CONFIG_SPI_TLE62X0 is not set	675	# CONFIG_SPI_TLE62X0 is not set
676	CONFIG_ARCH_REQUIRE_GPIOLIB=y	676	CONFIG_ARCH_REQUIRE_GPIOLIB=y


diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig index b0572d213826..86a45b5c9d0d 100644 --- a/arch/avr32/configs/atngw100_evklcd100_defconfig +++ b/arch/avr32/configs/atngw100_evklcd100_defconfig
@@ -671,7 +671,7 @@ CONFIG_I2C_GPIO=m
671	# Miscellaneous I2C Chip support	671	# Miscellaneous I2C Chip support
672	#	672	#
673	# CONFIG_DS1682 is not set	673	# CONFIG_DS1682 is not set
674	# CONFIG_SENSORS_EEPROM is not set	674	# CONFIG_EEPROM_LEGACY is not set
675	# CONFIG_SENSORS_PCF8574 is not set	675	# CONFIG_SENSORS_PCF8574 is not set
676	# CONFIG_PCF8575 is not set	676	# CONFIG_PCF8575 is not set
677	# CONFIG_SENSORS_PCF8591 is not set	677	# CONFIG_SENSORS_PCF8591 is not set
@@ -699,7 +699,7 @@ CONFIG_SPI_ATMEL=y
699	#	699	#
700	# SPI Protocol Masters	700	# SPI Protocol Masters
701	#	701	#
702	# CONFIG_SPI_AT25 is not set	702	# CONFIG_EEPROM_AT25 is not set
703	CONFIG_SPI_SPIDEV=m	703	CONFIG_SPI_SPIDEV=m
704	# CONFIG_SPI_TLE62X0 is not set	704	# CONFIG_SPI_TLE62X0 is not set
705	CONFIG_HAVE_GPIO_LIB=y	705	CONFIG_HAVE_GPIO_LIB=y


diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig index c5b898d21075..a96b68ea5e83 100644 --- a/arch/avr32/configs/atngw100_evklcd101_defconfig +++ b/arch/avr32/configs/atngw100_evklcd101_defconfig
@@ -671,7 +671,7 @@ CONFIG_I2C_GPIO=m
671	# Miscellaneous I2C Chip support	671	# Miscellaneous I2C Chip support
672	#	672	#
673	# CONFIG_DS1682 is not set	673	# CONFIG_DS1682 is not set
674	# CONFIG_SENSORS_EEPROM is not set	674	# CONFIG_EEPROM_LEGACY is not set
675	# CONFIG_SENSORS_PCF8574 is not set	675	# CONFIG_SENSORS_PCF8574 is not set
676	# CONFIG_PCF8575 is not set	676	# CONFIG_PCF8575 is not set
677	# CONFIG_SENSORS_PCF8591 is not set	677	# CONFIG_SENSORS_PCF8591 is not set
@@ -699,7 +699,7 @@ CONFIG_SPI_ATMEL=y
699	#	699	#
700	# SPI Protocol Masters	700	# SPI Protocol Masters
701	#	701	#
702	# CONFIG_SPI_AT25 is not set	702	# CONFIG_EEPROM_AT25 is not set
703	CONFIG_SPI_SPIDEV=m	703	CONFIG_SPI_SPIDEV=m
704	# CONFIG_SPI_TLE62X0 is not set	704	# CONFIG_SPI_TLE62X0 is not set
705	CONFIG_HAVE_GPIO_LIB=y	705	CONFIG_HAVE_GPIO_LIB=y


diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig index c9dc64832a19..0abe90adb1a4 100644 --- a/arch/avr32/configs/atstk1002_defconfig +++ b/arch/avr32/configs/atstk1002_defconfig
@@ -663,8 +663,8 @@ CONFIG_I2C_GPIO=m
663	# Miscellaneous I2C Chip support	663	# Miscellaneous I2C Chip support
664	#	664	#
665	# CONFIG_DS1682 is not set	665	# CONFIG_DS1682 is not set
666	CONFIG_AT24=m	666	CONFIG_EEPROM_AT24=m
667	# CONFIG_SENSORS_EEPROM is not set	667	# CONFIG_EEPROM_LEGACY is not set
668	# CONFIG_SENSORS_PCF8574 is not set	668	# CONFIG_SENSORS_PCF8574 is not set
669	# CONFIG_PCF8575 is not set	669	# CONFIG_PCF8575 is not set
670	# CONFIG_SENSORS_PCA9539 is not set	670	# CONFIG_SENSORS_PCA9539 is not set
@@ -689,7 +689,7 @@ CONFIG_SPI_ATMEL=y
689	#	689	#
690	# SPI Protocol Masters	690	# SPI Protocol Masters
691	#	691	#
692	# CONFIG_SPI_AT25 is not set	692	# CONFIG_EEPROM_AT25 is not set
693	CONFIG_SPI_SPIDEV=m	693	CONFIG_SPI_SPIDEV=m
694	# CONFIG_SPI_TLE62X0 is not set	694	# CONFIG_SPI_TLE62X0 is not set
695	CONFIG_ARCH_REQUIRE_GPIOLIB=y	695	CONFIG_ARCH_REQUIRE_GPIOLIB=y


diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig index 29ea1327b498..101972f40f07 100644 --- a/arch/avr32/configs/atstk1003_defconfig +++ b/arch/avr32/configs/atstk1003_defconfig
@@ -611,8 +611,8 @@ CONFIG_I2C_GPIO=m
611	# Miscellaneous I2C Chip support	611	# Miscellaneous I2C Chip support
612	#	612	#
613	# CONFIG_DS1682 is not set	613	# CONFIG_DS1682 is not set
614	CONFIG_AT24=m	614	CONFIG_EEPROM_AT24=m
615	# CONFIG_SENSORS_EEPROM is not set	615	# CONFIG_EEPROM_LEGACY is not set
616	# CONFIG_SENSORS_PCF8574 is not set	616	# CONFIG_SENSORS_PCF8574 is not set
617	# CONFIG_PCF8575 is not set	617	# CONFIG_PCF8575 is not set
618	# CONFIG_SENSORS_PCA9539 is not set	618	# CONFIG_SENSORS_PCA9539 is not set
@@ -637,7 +637,7 @@ CONFIG_SPI_ATMEL=y
637	#	637	#
638	# SPI Protocol Masters	638	# SPI Protocol Masters
639	#	639	#
640	# CONFIG_SPI_AT25 is not set	640	# CONFIG_EEPROM_AT25 is not set
641	CONFIG_SPI_SPIDEV=m	641	CONFIG_SPI_SPIDEV=m
642	# CONFIG_SPI_TLE62X0 is not set	642	# CONFIG_SPI_TLE62X0 is not set
643	CONFIG_ARCH_REQUIRE_GPIOLIB=y	643	CONFIG_ARCH_REQUIRE_GPIOLIB=y


diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig index 69e6c0d08ce8..518f7898df75 100644 --- a/arch/avr32/configs/atstk1004_defconfig +++ b/arch/avr32/configs/atstk1004_defconfig
@@ -394,7 +394,7 @@ CONFIG_SPI_ATMEL=y
394	#	394	#
395	# SPI Protocol Masters	395	# SPI Protocol Masters
396	#	396	#
397	# CONFIG_SPI_AT25 is not set	397	# CONFIG_EEPROM_AT25 is not set
398	# CONFIG_SPI_SPIDEV is not set	398	# CONFIG_SPI_SPIDEV is not set
399	# CONFIG_SPI_TLE62X0 is not set	399	# CONFIG_SPI_TLE62X0 is not set
400	CONFIG_ARCH_REQUIRE_GPIOLIB=y	400	CONFIG_ARCH_REQUIRE_GPIOLIB=y


diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig index 361c31c2af10..c1603c4860e0 100644 --- a/arch/avr32/configs/atstk1006_defconfig +++ b/arch/avr32/configs/atstk1006_defconfig
@@ -684,8 +684,8 @@ CONFIG_I2C_GPIO=m
684	# Miscellaneous I2C Chip support	684	# Miscellaneous I2C Chip support
685	#	685	#
686	# CONFIG_DS1682 is not set	686	# CONFIG_DS1682 is not set
687	# CONFIG_AT24 is not set	687	# CONFIG_EEPROM_AT24 is not set
688	# CONFIG_SENSORS_EEPROM is not set	688	# CONFIG_EEPROM_LEGACY is not set
689	# CONFIG_SENSORS_PCF8574 is not set	689	# CONFIG_SENSORS_PCF8574 is not set
690	# CONFIG_PCF8575 is not set	690	# CONFIG_PCF8575 is not set
691	# CONFIG_SENSORS_PCA9539 is not set	691	# CONFIG_SENSORS_PCA9539 is not set
@@ -710,7 +710,7 @@ CONFIG_SPI_ATMEL=y
710	#	710	#
711	# SPI Protocol Masters	711	# SPI Protocol Masters
712	#	712	#
713	# CONFIG_SPI_AT25 is not set	713	# CONFIG_EEPROM_AT25 is not set
714	CONFIG_SPI_SPIDEV=m	714	CONFIG_SPI_SPIDEV=m
715	# CONFIG_SPI_TLE62X0 is not set	715	# CONFIG_SPI_TLE62X0 is not set
716	CONFIG_ARCH_REQUIRE_GPIOLIB=y	716	CONFIG_ARCH_REQUIRE_GPIOLIB=y


diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig index e2bd9982e2af..4c3ac0643e4a 100644 --- a/arch/avr32/configs/favr-32_defconfig +++ b/arch/avr32/configs/favr-32_defconfig
@@ -633,8 +633,8 @@ CONFIG_I2C_GPIO=m
633	# Miscellaneous I2C Chip support	633	# Miscellaneous I2C Chip support
634	#	634	#
635	# CONFIG_DS1682 is not set	635	# CONFIG_DS1682 is not set
636	# CONFIG_AT24 is not set	636	# CONFIG_EEPROM_AT24 is not set
637	# CONFIG_SENSORS_EEPROM is not set	637	# CONFIG_EEPROM_LEGACY is not set
638	# CONFIG_SENSORS_PCF8574 is not set	638	# CONFIG_SENSORS_PCF8574 is not set
639	# CONFIG_PCF8575 is not set	639	# CONFIG_PCF8575 is not set
640	# CONFIG_SENSORS_PCA9539 is not set	640	# CONFIG_SENSORS_PCA9539 is not set
@@ -659,7 +659,7 @@ CONFIG_SPI_ATMEL=y
659	#	659	#
660	# SPI Protocol Masters	660	# SPI Protocol Masters
661	#	661	#
662	# CONFIG_SPI_AT25 is not set	662	# CONFIG_EEPROM_AT25 is not set
663	CONFIG_SPI_SPIDEV=m	663	CONFIG_SPI_SPIDEV=m
664	# CONFIG_SPI_TLE62X0 is not set	664	# CONFIG_SPI_TLE62X0 is not set
665	CONFIG_ARCH_REQUIRE_GPIOLIB=y	665	CONFIG_ARCH_REQUIRE_GPIOLIB=y


diff --git a/arch/avr32/configs/hammerhead_defconfig b/arch/avr32/configs/hammerhead_defconfig index 0d3d2982c8f5..3970fcc4d76e 100644 --- a/arch/avr32/configs/hammerhead_defconfig +++ b/arch/avr32/configs/hammerhead_defconfig
@@ -716,8 +716,8 @@ CONFIG_I2C_GPIO=m
716	# Miscellaneous I2C Chip support	716	# Miscellaneous I2C Chip support
717	#	717	#
718	# CONFIG_DS1682 is not set	718	# CONFIG_DS1682 is not set
719	# CONFIG_AT24 is not set	719	# CONFIG_EEPROM_AT24 is not set
720	# CONFIG_SENSORS_EEPROM is not set	720	# CONFIG_EEPROM_LEGACY is not set
721	# CONFIG_SENSORS_PCF8574 is not set	721	# CONFIG_SENSORS_PCF8574 is not set
722	# CONFIG_PCF8575 is not set	722	# CONFIG_PCF8575 is not set
723	# CONFIG_SENSORS_PCA9539 is not set	723	# CONFIG_SENSORS_PCA9539 is not set
@@ -742,7 +742,7 @@ CONFIG_SPI_ATMEL=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=m	746	CONFIG_SPI_SPIDEV=m
747	# CONFIG_SPI_TLE62X0 is not set	747	# CONFIG_SPI_TLE62X0 is not set
748	CONFIG_ARCH_REQUIRE_GPIOLIB=y	748	CONFIG_ARCH_REQUIRE_GPIOLIB=y


diff --git a/arch/avr32/configs/mimc200_defconfig b/arch/avr32/configs/mimc200_defconfig index 981e4f8b8aeb..1a58ffbc752d 100644 --- a/arch/avr32/configs/mimc200_defconfig +++ b/arch/avr32/configs/mimc200_defconfig
@@ -565,8 +565,8 @@ CONFIG_I2C_GPIO=y
565	# Miscellaneous I2C Chip support	565	# Miscellaneous I2C Chip support
566	#	566	#
567	# CONFIG_DS1682 is not set	567	# CONFIG_DS1682 is not set
568	CONFIG_AT24=y	568	CONFIG_EEPROM_AT24=y
569	# CONFIG_SENSORS_EEPROM is not set	569	# CONFIG_EEPROM_LEGACY is not set
570	# CONFIG_SENSORS_PCF8574 is not set	570	# CONFIG_SENSORS_PCF8574 is not set
571	# CONFIG_PCF8575 is not set	571	# CONFIG_PCF8575 is not set
572	# CONFIG_SENSORS_PCA9539 is not set	572	# CONFIG_SENSORS_PCA9539 is not set
@@ -592,7 +592,7 @@ CONFIG_SPI_ATMEL=y
592	#	592	#
593	# SPI Protocol Masters	593	# SPI Protocol Masters
594	#	594	#
595	CONFIG_SPI_AT25=y	595	CONFIG_EEPROM_AT25=y
596	# CONFIG_SPI_SPIDEV is not set	596	# CONFIG_SPI_SPIDEV is not set
597	# CONFIG_SPI_TLE62X0 is not set	597	# CONFIG_SPI_TLE62X0 is not set
598	CONFIG_ARCH_REQUIRE_GPIOLIB=y	598	CONFIG_ARCH_REQUIRE_GPIOLIB=y