diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
| commit | abcea2c322cef559ef2f108b4763d107a5ccc37f (patch) | |
| tree | 5fec7fec372f9bdb70703f6c77bfc49cda945442 /arch/blackfin/configs/SRV1_defconfig | |
| parent | 8118aea23c328fd4913b325af53fda9d530b1d56 (diff) | |
| parent | 6d831c6554e4f95083919914955a1a3a4a6acfa9 (diff) | |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
Diffstat (limited to 'arch/blackfin/configs/SRV1_defconfig')
| -rw-r--r-- | arch/blackfin/configs/SRV1_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/configs/SRV1_defconfig b/arch/blackfin/configs/SRV1_defconfig index 7c8250d6fa66..fa580affc9d6 100644 --- a/arch/blackfin/configs/SRV1_defconfig +++ b/arch/blackfin/configs/SRV1_defconfig | |||
| @@ -798,7 +798,7 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 | |||
| 798 | # CONFIG_SENSORS_DS1337 is not set | 798 | # CONFIG_SENSORS_DS1337 is not set |
| 799 | # CONFIG_SENSORS_DS1374 is not set | 799 | # CONFIG_SENSORS_DS1374 is not set |
| 800 | # CONFIG_SENSORS_AD5252 is not set | 800 | # CONFIG_SENSORS_AD5252 is not set |
| 801 | # CONFIG_SENSORS_EEPROM is not set | 801 | # CONFIG_EEPROM_LEGACY is not set |
| 802 | # CONFIG_SENSORS_PCF8574 is not set | 802 | # CONFIG_SENSORS_PCF8574 is not set |
| 803 | # CONFIG_SENSORS_PCF8575 is not set | 803 | # CONFIG_SENSORS_PCF8575 is not set |
| 804 | # CONFIG_SENSORS_PCA9543 is not set | 804 | # CONFIG_SENSORS_PCA9543 is not set |
| @@ -826,7 +826,7 @@ CONFIG_SPI_BFIN=y | |||
| 826 | # | 826 | # |
| 827 | # SPI Protocol Masters | 827 | # SPI Protocol Masters |
| 828 | # | 828 | # |
| 829 | CONFIG_SPI_AT25=m | 829 | CONFIG_EEPROM_AT25=m |
| 830 | # CONFIG_SPI_SPIDEV is not set | 830 | # CONFIG_SPI_SPIDEV is not set |
| 831 | 831 | ||
| 832 | # | 832 | # |