diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 13:08:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 13:08:57 +0100 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /arch/blackfin/configs/H8606_defconfig | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
| download | talos-obmc-linux-871cafcc962fa1655c44b4f0e54d4c5cc14e273c.tar.gz talos-obmc-linux-871cafcc962fa1655c44b4f0e54d4c5cc14e273c.zip | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'arch/blackfin/configs/H8606_defconfig')
| -rw-r--r-- | arch/blackfin/configs/H8606_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
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 # |
