diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 14:50:57 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 14:50:57 -0800 |
commit | 9b7ed8faa034fc2d350e2eff5c68680eb5c43a07 (patch) | |
tree | 5c94c34ad30e312604c1ce4f08ab6631b64a94f5 /arch/blackfin/configs/TCM-BF537_defconfig | |
parent | 6522869c34664dd5f05a0a327e93915b1281c90d (diff) | |
parent | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (diff) | |
download | kernel-crypto-9b7ed8faa034fc2d350e2eff5c68680eb5c43a07.tar.gz kernel-crypto-9b7ed8faa034fc2d350e2eff5c68680eb5c43a07.tar.xz kernel-crypto-9b7ed8faa034fc2d350e2eff5c68680eb5c43a07.zip |
Merge branch 'core/percpu' into x86/paravirt
Diffstat (limited to 'arch/blackfin/configs/TCM-BF537_defconfig')
-rw-r--r-- | arch/blackfin/configs/TCM-BF537_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/configs/TCM-BF537_defconfig b/arch/blackfin/configs/TCM-BF537_defconfig index 9af522c7dad..97a1f1d20dc 100644 --- a/arch/blackfin/configs/TCM-BF537_defconfig +++ b/arch/blackfin/configs/TCM-BF537_defconfig @@ -533,7 +533,7 @@ CONFIG_SPI_BFIN=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_WANT_OPTIONAL_GPIOLIB=y |