diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
commit | d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de (patch) | |
tree | 1e8c402df9b1154f4ca37eb5242f960ef7aab747 /arch/blackfin/configs/TCM-BF537_defconfig | |
parent | ALSA: Add missing KERN_* prefix to printk in other sound/* (diff) | |
parent | ALSA: Add subdevice_mask field to quirk entries (diff) | |
download | linux-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.tar.xz linux-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.zip |
Merge branch 'topic/quirk-cleanup' into topic/misc
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 9af522c7dadf..97a1f1d20dcf 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 |