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/atngw100_evklcd101_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/atngw100_evklcd101_defconfig')
| -rw-r--r-- | arch/avr32/configs/atngw100_evklcd101_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig index c5b898d21075..a96b68ea5e83 100644 --- a/arch/avr32/configs/atngw100_evklcd101_defconfig +++ b/arch/avr32/configs/atngw100_evklcd101_defconfig | |||
| @@ -671,7 +671,7 @@ CONFIG_I2C_GPIO=m | |||
| 671 | # Miscellaneous I2C Chip support | 671 | # Miscellaneous I2C Chip support |
| 672 | # | 672 | # |
| 673 | # CONFIG_DS1682 is not set | 673 | # CONFIG_DS1682 is not set |
| 674 | # CONFIG_SENSORS_EEPROM is not set | 674 | # CONFIG_EEPROM_LEGACY is not set |
| 675 | # CONFIG_SENSORS_PCF8574 is not set | 675 | # CONFIG_SENSORS_PCF8574 is not set |
| 676 | # CONFIG_PCF8575 is not set | 676 | # CONFIG_PCF8575 is not set |
| 677 | # CONFIG_SENSORS_PCF8591 is not set | 677 | # CONFIG_SENSORS_PCF8591 is not set |
| @@ -699,7 +699,7 @@ CONFIG_SPI_ATMEL=y | |||
| 699 | # | 699 | # |
| 700 | # SPI Protocol Masters | 700 | # SPI Protocol Masters |
| 701 | # | 701 | # |
| 702 | # CONFIG_SPI_AT25 is not set | 702 | # CONFIG_EEPROM_AT25 is not set |
| 703 | CONFIG_SPI_SPIDEV=m | 703 | CONFIG_SPI_SPIDEV=m |
| 704 | # CONFIG_SPI_TLE62X0 is not set | 704 | # CONFIG_SPI_TLE62X0 is not set |
| 705 | CONFIG_HAVE_GPIO_LIB=y | 705 | CONFIG_HAVE_GPIO_LIB=y |