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/ia64 | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/configs/bigsur_defconfig | 2 | ||||
| -rw-r--r-- | arch/ia64/configs/zx1_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig index 6dd8655664f3..ace41096b47b 100644 --- a/arch/ia64/configs/bigsur_defconfig +++ b/arch/ia64/configs/bigsur_defconfig | |||
| @@ -752,7 +752,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 752 | # | 752 | # |
| 753 | # CONFIG_SENSORS_DS1337 is not set | 753 | # CONFIG_SENSORS_DS1337 is not set |
| 754 | # CONFIG_SENSORS_DS1374 is not set | 754 | # CONFIG_SENSORS_DS1374 is not set |
| 755 | # CONFIG_SENSORS_EEPROM is not set | 755 | # CONFIG_EEPROM_LEGACY is not set |
| 756 | # CONFIG_SENSORS_PCF8574 is not set | 756 | # CONFIG_SENSORS_PCF8574 is not set |
| 757 | # CONFIG_SENSORS_PCA9539 is not set | 757 | # CONFIG_SENSORS_PCA9539 is not set |
| 758 | # CONFIG_SENSORS_PCF8591 is not set | 758 | # CONFIG_SENSORS_PCF8591 is not set |
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 0a06b1333c95..514f0635dafe 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig | |||
| @@ -841,7 +841,7 @@ CONFIG_I2C_ALGOPCF=y | |||
| 841 | # | 841 | # |
| 842 | # CONFIG_SENSORS_DS1337 is not set | 842 | # CONFIG_SENSORS_DS1337 is not set |
| 843 | # CONFIG_SENSORS_DS1374 is not set | 843 | # CONFIG_SENSORS_DS1374 is not set |
| 844 | # CONFIG_SENSORS_EEPROM is not set | 844 | # CONFIG_EEPROM_LEGACY is not set |
| 845 | # CONFIG_SENSORS_PCF8574 is not set | 845 | # CONFIG_SENSORS_PCF8574 is not set |
| 846 | # CONFIG_SENSORS_PCA9539 is not set | 846 | # CONFIG_SENSORS_PCA9539 is not set |
| 847 | # CONFIG_SENSORS_PCF8591 is not set | 847 | # CONFIG_SENSORS_PCF8591 is not set |