diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 11:38:55 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 11:38:55 +0100 |
| commit | 891393745aad5c5acdb01b6ce61c08d4cc064649 (patch) | |
| tree | 7687b8b94c4bc4ec8d5f1106ff8ff4d557b2fabf /arch/blackfin/configs/H8606_defconfig | |
| parent | a448720ca3248e8a7a426336885549d6e923fd8e (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into x86/cleanups
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 5d3901d23fd..bd553da15db 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 # |