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/arm/configs/at91cap9adk_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/arm/configs/at91cap9adk_defconfig')
| -rw-r--r-- | arch/arm/configs/at91cap9adk_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/at91cap9adk_defconfig b/arch/arm/configs/at91cap9adk_defconfig index bf97801a1068..bc6bd9f6174d 100644 --- a/arch/arm/configs/at91cap9adk_defconfig +++ b/arch/arm/configs/at91cap9adk_defconfig | |||
| @@ -676,7 +676,7 @@ CONFIG_I2C_CHARDEV=y | |||
| 676 | # CONFIG_SENSORS_DS1337 is not set | 676 | # CONFIG_SENSORS_DS1337 is not set |
| 677 | # CONFIG_SENSORS_DS1374 is not set | 677 | # CONFIG_SENSORS_DS1374 is not set |
| 678 | # CONFIG_DS1682 is not set | 678 | # CONFIG_DS1682 is not set |
| 679 | # CONFIG_SENSORS_EEPROM is not set | 679 | # CONFIG_EEPROM_LEGACY is not set |
| 680 | # CONFIG_SENSORS_PCF8574 is not set | 680 | # CONFIG_SENSORS_PCF8574 is not set |
| 681 | # CONFIG_SENSORS_PCA9539 is not set | 681 | # CONFIG_SENSORS_PCA9539 is not set |
| 682 | # CONFIG_SENSORS_PCF8591 is not set | 682 | # CONFIG_SENSORS_PCF8591 is not set |
| @@ -703,7 +703,7 @@ CONFIG_SPI_ATMEL=y | |||
| 703 | # | 703 | # |
| 704 | # SPI Protocol Masters | 704 | # SPI Protocol Masters |
| 705 | # | 705 | # |
| 706 | # CONFIG_SPI_AT25 is not set | 706 | # CONFIG_EEPROM_AT25 is not set |
| 707 | # CONFIG_SPI_SPIDEV is not set | 707 | # CONFIG_SPI_SPIDEV is not set |
| 708 | # CONFIG_SPI_TLE62X0 is not set | 708 | # CONFIG_SPI_TLE62X0 is not set |
| 709 | # CONFIG_W1 is not set | 709 | # CONFIG_W1 is not set |