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/picotux200_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/picotux200_defconfig')
| -rw-r--r-- | arch/arm/configs/picotux200_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/picotux200_defconfig b/arch/arm/configs/picotux200_defconfig index 59e4463c2da2..9018f0f298aa 100644 --- a/arch/arm/configs/picotux200_defconfig +++ b/arch/arm/configs/picotux200_defconfig | |||
| @@ -744,7 +744,7 @@ CONFIG_I2C_GPIO=m | |||
| 744 | # | 744 | # |
| 745 | CONFIG_SENSORS_DS1337=m | 745 | CONFIG_SENSORS_DS1337=m |
| 746 | CONFIG_SENSORS_DS1374=m | 746 | CONFIG_SENSORS_DS1374=m |
| 747 | CONFIG_SENSORS_EEPROM=m | 747 | CONFIG_EEPROM_LEGACY=m |
| 748 | CONFIG_SENSORS_PCF8574=m | 748 | CONFIG_SENSORS_PCF8574=m |
| 749 | CONFIG_SENSORS_PCA9539=m | 749 | CONFIG_SENSORS_PCA9539=m |
| 750 | CONFIG_SENSORS_PCF8591=m | 750 | CONFIG_SENSORS_PCF8591=m |