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/ezx_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/ezx_defconfig')
| -rw-r--r-- | arch/arm/configs/ezx_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig index 2a84d557adc2..d5ee16e6abf3 100644 --- a/arch/arm/configs/ezx_defconfig +++ b/arch/arm/configs/ezx_defconfig | |||
| @@ -877,7 +877,7 @@ CONFIG_I2C_PXA=y | |||
| 877 | # Miscellaneous I2C Chip support | 877 | # Miscellaneous I2C Chip support |
| 878 | # | 878 | # |
| 879 | # CONFIG_DS1682 is not set | 879 | # CONFIG_DS1682 is not set |
| 880 | # CONFIG_SENSORS_EEPROM is not set | 880 | # CONFIG_EEPROM_LEGACY is not set |
| 881 | # CONFIG_SENSORS_PCF8574 is not set | 881 | # CONFIG_SENSORS_PCF8574 is not set |
| 882 | # CONFIG_PCF8575 is not set | 882 | # CONFIG_PCF8575 is not set |
| 883 | # CONFIG_SENSORS_PCF8591 is not set | 883 | # CONFIG_SENSORS_PCF8591 is not set |
| @@ -900,7 +900,7 @@ CONFIG_SPI_PXA2XX=m | |||
| 900 | # | 900 | # |
| 901 | # SPI Protocol Masters | 901 | # SPI Protocol Masters |
| 902 | # | 902 | # |
| 903 | # CONFIG_SPI_AT25 is not set | 903 | # CONFIG_EEPROM_AT25 is not set |
| 904 | # CONFIG_SPI_SPIDEV is not set | 904 | # CONFIG_SPI_SPIDEV is not set |
| 905 | # CONFIG_SPI_TLE62X0 is not set | 905 | # CONFIG_SPI_TLE62X0 is not set |
| 906 | CONFIG_HAVE_GPIO_LIB=y | 906 | CONFIG_HAVE_GPIO_LIB=y |