diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-09 02:30:55 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-09 02:30:55 +0300 |
| commit | d15c22e78674f9a5bc0de0932a43abe1aafae303 (patch) | |
| tree | 3e4198c44bd2d9184e91647346c66aa95e28f843 /arch/arm/configs/palmz71_defconfig | |
| parent | 0f4954819fb6f840d46076f0dbd313ef5da48f5d (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
| download | linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.xz | |
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'arch/arm/configs/palmz71_defconfig')
| -rw-r--r-- | arch/arm/configs/palmz71_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/palmz71_defconfig b/arch/arm/configs/palmz71_defconfig index 6361922e71c1..08e14068fff7 100644 --- a/arch/arm/configs/palmz71_defconfig +++ b/arch/arm/configs/palmz71_defconfig @@ -554,7 +554,7 @@ CONFIG_SPI_OMAP_UWIRE=y # # SPI Protocol Masters # -# CONFIG_SPI_AT25 is not set +# CONFIG_EEPROM_AT25 is not set # CONFIG_SPI_TSC2101 is not set # CONFIG_SPI_TSC2102 is not set # CONFIG_SPI_TSC210X is not set |