diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 /arch/blackfin/configs/SRV1_defconfig | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
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 | # |