diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 17:38:41 +0100 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 17:38:41 +0100 |
| commit | 6d2160bfe7826aca1c94b4bca77093908a452ae7 (patch) | |
| tree | 8153fcd8a7c467e5de136f312e8ef5b27bea9d6b /arch/avr32/configs/atstk1004_defconfig | |
| parent | don't reallocate sxp variable passed into xfs_swapext (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
| download | linux-6d2160bfe7826aca1c94b4bca77093908a452ae7.tar.xz linux-6d2160bfe7826aca1c94b4bca77093908a452ae7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/avr32/configs/atstk1004_defconfig')
| -rw-r--r-- | arch/avr32/configs/atstk1004_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig index 69e6c0d08ce8..518f7898df75 100644 --- a/arch/avr32/configs/atstk1004_defconfig +++ b/arch/avr32/configs/atstk1004_defconfig @@ -394,7 +394,7 @@ CONFIG_SPI_ATMEL=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_REQUIRE_GPIOLIB=y |