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/arm/configs/cam60_defconfig | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/arm/configs/cam60_defconfig')
| -rw-r--r-- | arch/arm/configs/cam60_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/cam60_defconfig b/arch/arm/configs/cam60_defconfig index f945105d6cd6..8448108347cf 100644 --- a/arch/arm/configs/cam60_defconfig +++ b/arch/arm/configs/cam60_defconfig | |||
| @@ -722,7 +722,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 722 | # CONFIG_SENSORS_DS1337 is not set | 722 | # CONFIG_SENSORS_DS1337 is not set |
| 723 | # CONFIG_SENSORS_DS1374 is not set | 723 | # CONFIG_SENSORS_DS1374 is not set |
| 724 | # CONFIG_DS1682 is not set | 724 | # CONFIG_DS1682 is not set |
| 725 | # CONFIG_SENSORS_EEPROM is not set | 725 | # CONFIG_EEPROM_LEGACY is not set |
| 726 | # CONFIG_SENSORS_PCF8574 is not set | 726 | # CONFIG_SENSORS_PCF8574 is not set |
| 727 | # CONFIG_SENSORS_PCA9539 is not set | 727 | # CONFIG_SENSORS_PCA9539 is not set |
| 728 | # CONFIG_SENSORS_PCF8591 is not set | 728 | # CONFIG_SENSORS_PCF8591 is not set |
| @@ -749,7 +749,7 @@ CONFIG_SPI_ATMEL=y | |||
| 749 | # | 749 | # |
| 750 | # SPI Protocol Masters | 750 | # SPI Protocol Masters |
| 751 | # | 751 | # |
| 752 | # CONFIG_SPI_AT25 is not set | 752 | # CONFIG_EEPROM_AT25 is not set |
| 753 | # CONFIG_SPI_SPIDEV is not set | 753 | # CONFIG_SPI_SPIDEV is not set |
| 754 | # CONFIG_SPI_TLE62X0 is not set | 754 | # CONFIG_SPI_TLE62X0 is not set |
| 755 | # CONFIG_W1 is not set | 755 | # CONFIG_W1 is not set |