diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-25 10:40:10 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-25 10:40:10 -0500 |
| commit | 2e31add2a7e2a15d07f592c21ba35870fa9a1d1f (patch) | |
| tree | 814e2c70fb5528f108114c0da6e5a1e219e6a0e1 /arch/blackfin/configs/PNAV-10_defconfig | |
| parent | d639bab8da86d330493487e8c0fea8ca31f53427 (diff) | |
| parent | 17581ad812a9abb0182260374ef2e52d4a808a64 (diff) | |
Merge branch 'x86/urgent' into x86/pat
Diffstat (limited to 'arch/blackfin/configs/PNAV-10_defconfig')
| -rw-r--r-- | arch/blackfin/configs/PNAV-10_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig index ce5dde9de9db..ad096702ac16 100644 --- a/arch/blackfin/configs/PNAV-10_defconfig +++ b/arch/blackfin/configs/PNAV-10_defconfig | |||
| @@ -755,9 +755,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 | |||
| 755 | # Miscellaneous I2C Chip support | 755 | # Miscellaneous I2C Chip support |
| 756 | # | 756 | # |
| 757 | # CONFIG_DS1682 is not set | 757 | # CONFIG_DS1682 is not set |
| 758 | # CONFIG_AT24 is not set | 758 | # CONFIG_EEPROM_AT24 is not set |
| 759 | # CONFIG_SENSORS_AD5252 is not set | 759 | # CONFIG_SENSORS_AD5252 is not set |
| 760 | # CONFIG_SENSORS_EEPROM is not set | 760 | # CONFIG_EEPROM_LEGACY is not set |
| 761 | CONFIG_SENSORS_PCF8574=m | 761 | CONFIG_SENSORS_PCF8574=m |
| 762 | # CONFIG_PCF8575 is not set | 762 | # CONFIG_PCF8575 is not set |
| 763 | # CONFIG_SENSORS_PCA9539 is not set | 763 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -781,7 +781,7 @@ CONFIG_SPI_BFIN=y | |||
| 781 | # | 781 | # |
| 782 | # SPI Protocol Masters | 782 | # SPI Protocol Masters |
| 783 | # | 783 | # |
| 784 | # CONFIG_SPI_AT25 is not set | 784 | # CONFIG_EEPROM_AT25 is not set |
| 785 | # CONFIG_SPI_SPIDEV is not set | 785 | # CONFIG_SPI_SPIDEV is not set |
| 786 | # CONFIG_SPI_TLE62X0 is not set | 786 | # CONFIG_SPI_TLE62X0 is not set |
| 787 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 787 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |