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/s3c6400_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/s3c6400_defconfig')
| -rw-r--r-- | arch/arm/configs/s3c6400_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig index cf3c1b5d7048..2e8fa50e9a09 100644 --- a/arch/arm/configs/s3c6400_defconfig +++ b/arch/arm/configs/s3c6400_defconfig | |||
| @@ -465,8 +465,8 @@ CONFIG_I2C_S3C2410=y | |||
| 465 | # Miscellaneous I2C Chip support | 465 | # Miscellaneous I2C Chip support |
| 466 | # | 466 | # |
| 467 | # CONFIG_DS1682 is not set | 467 | # CONFIG_DS1682 is not set |
| 468 | CONFIG_AT24=y | 468 | CONFIG_EEPROM_AT24=y |
| 469 | # CONFIG_SENSORS_EEPROM is not set | 469 | # CONFIG_EEPROM_LEGACY is not set |
| 470 | # CONFIG_SENSORS_PCF8574 is not set | 470 | # CONFIG_SENSORS_PCF8574 is not set |
| 471 | # CONFIG_PCF8575 is not set | 471 | # CONFIG_PCF8575 is not set |
| 472 | # CONFIG_SENSORS_PCA9539 is not set | 472 | # CONFIG_SENSORS_PCA9539 is not set |