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/blackfin/configs/BF527-EZKIT_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/blackfin/configs/BF527-EZKIT_defconfig')
| -rw-r--r-- | arch/blackfin/configs/BF527-EZKIT_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig index f92668af00b0..21e3c1af55ba 100644 --- a/arch/blackfin/configs/BF527-EZKIT_defconfig +++ b/arch/blackfin/configs/BF527-EZKIT_defconfig | |||
| @@ -837,9 +837,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 | |||
| 837 | # Miscellaneous I2C Chip support | 837 | # Miscellaneous I2C Chip support |
| 838 | # | 838 | # |
| 839 | # CONFIG_DS1682 is not set | 839 | # CONFIG_DS1682 is not set |
| 840 | # CONFIG_AT24 is not set | 840 | # CONFIG_EEPROM_AT24 is not set |
| 841 | # CONFIG_SENSORS_AD5252 is not set | 841 | # CONFIG_SENSORS_AD5252 is not set |
| 842 | # CONFIG_SENSORS_EEPROM is not set | 842 | # CONFIG_EEPROM_LEGACY is not set |
| 843 | # CONFIG_SENSORS_PCF8574 is not set | 843 | # CONFIG_SENSORS_PCF8574 is not set |
| 844 | # CONFIG_PCF8575 is not set | 844 | # CONFIG_PCF8575 is not set |
| 845 | # CONFIG_SENSORS_PCA9539 is not set | 845 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -864,7 +864,7 @@ CONFIG_SPI_BFIN=y | |||
| 864 | # | 864 | # |
| 865 | # SPI Protocol Masters | 865 | # SPI Protocol Masters |
| 866 | # | 866 | # |
| 867 | # CONFIG_SPI_AT25 is not set | 867 | # CONFIG_EEPROM_AT25 is not set |
| 868 | # CONFIG_SPI_SPIDEV is not set | 868 | # CONFIG_SPI_SPIDEV is not set |
| 869 | # CONFIG_SPI_TLE62X0 is not set | 869 | # CONFIG_SPI_TLE62X0 is not set |
| 870 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 870 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |