diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 17:50:57 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 17:50:57 -0500 |
| commit | 9b7ed8faa034fc2d350e2eff5c68680eb5c43a07 (patch) | |
| tree | 5c94c34ad30e312604c1ce4f08ab6631b64a94f5 /arch/arm/configs/at91cap9adk_defconfig | |
| parent | 6522869c34664dd5f05a0a327e93915b1281c90d (diff) | |
| parent | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (diff) | |
Merge branch 'core/percpu' into x86/paravirt
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 |