diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
| commit | 8f04915532485d81e7f6c580a396ea7b01094221 (patch) | |
| tree | c5740e961a025f2fb6b520a2bc5937f19d4345ab /arch/arm/configs/at91sam9g20ek_defconfig | |
| parent | 8f5140a6a0b1a9aa79585b0008e88c5d266c5c1d (diff) | |
| parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/arm/configs/at91sam9g20ek_defconfig')
| -rw-r--r-- | arch/arm/configs/at91sam9g20ek_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/at91sam9g20ek_defconfig b/arch/arm/configs/at91sam9g20ek_defconfig index df0d6ee672b..7e018a04c31 100644 --- a/arch/arm/configs/at91sam9g20ek_defconfig +++ b/arch/arm/configs/at91sam9g20ek_defconfig | |||
| @@ -665,7 +665,7 @@ CONFIG_SPI_ATMEL=y | |||
| 665 | # | 665 | # |
| 666 | # SPI Protocol Masters | 666 | # SPI Protocol Masters |
| 667 | # | 667 | # |
| 668 | # CONFIG_SPI_AT25 is not set | 668 | # CONFIG_EEPROM_AT25 is not set |
| 669 | CONFIG_SPI_SPIDEV=y | 669 | CONFIG_SPI_SPIDEV=y |
| 670 | # CONFIG_SPI_TLE62X0 is not set | 670 | # CONFIG_SPI_TLE62X0 is not set |
| 671 | # CONFIG_W1 is not set | 671 | # CONFIG_W1 is not set |