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/avr32/configs/atstk1006_defconfig | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/avr32/configs/atstk1006_defconfig')
| -rw-r--r-- | arch/avr32/configs/atstk1006_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig index 361c31c2af10..c1603c4860e0 100644 --- a/arch/avr32/configs/atstk1006_defconfig +++ b/arch/avr32/configs/atstk1006_defconfig | |||
| @@ -684,8 +684,8 @@ CONFIG_I2C_GPIO=m | |||
| 684 | # Miscellaneous I2C Chip support | 684 | # Miscellaneous I2C Chip support |
| 685 | # | 685 | # |
| 686 | # CONFIG_DS1682 is not set | 686 | # CONFIG_DS1682 is not set |
| 687 | # CONFIG_AT24 is not set | 687 | # CONFIG_EEPROM_AT24 is not set |
| 688 | # CONFIG_SENSORS_EEPROM is not set | 688 | # CONFIG_EEPROM_LEGACY is not set |
| 689 | # CONFIG_SENSORS_PCF8574 is not set | 689 | # CONFIG_SENSORS_PCF8574 is not set |
| 690 | # CONFIG_PCF8575 is not set | 690 | # CONFIG_PCF8575 is not set |
| 691 | # CONFIG_SENSORS_PCA9539 is not set | 691 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -710,7 +710,7 @@ CONFIG_SPI_ATMEL=y | |||
| 710 | # | 710 | # |
| 711 | # SPI Protocol Masters | 711 | # SPI Protocol Masters |
| 712 | # | 712 | # |
| 713 | # CONFIG_SPI_AT25 is not set | 713 | # CONFIG_EEPROM_AT25 is not set |
| 714 | CONFIG_SPI_SPIDEV=m | 714 | CONFIG_SPI_SPIDEV=m |
| 715 | # CONFIG_SPI_TLE62X0 is not set | 715 | # CONFIG_SPI_TLE62X0 is not set |
| 716 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 716 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |