Merge branch 'linus' into core/percpu

Conflicts:
	arch/x86/kernel/setup_percpu.c

1 files changed, 0 insertions, 11 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 4a6fe01831a8..83a185d52961 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -230,17 +230,6 @@ config SPI_XILINX
 #
 comment "SPI Protocol Masters"
 
-config SPI_AT25
-        tristate "SPI EEPROMs from most vendors"
-        depends on SYSFS
-        help
-          Enable this driver to get read/write support to most SPI EEPROMs,
-          after you configure the board init code to know about each eeprom
-          on your target board.
-
-          This driver can also be built as a module.  If so, the module
-          will be called at25.
-
 config SPI_SPIDEV
         tristate "User mode SPI device driver support"
         depends on EXPERIMENTAL