diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 /drivers/spi/Kconfig | |
| parent | generic, x86: fix __per_cpu_load relocation (diff) | |
| parent | Fix "multiple definition of `debugfs_create_size_t'" (diff) | |
| download | linux-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.tar.xz linux-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.zip | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'drivers/spi/Kconfig')
| -rw-r--r-- | drivers/spi/Kconfig | 11 |
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 |