diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
| commit | 8f04915532485d81e7f6c580a396ea7b01094221 (patch) | |
| tree | c5740e961a025f2fb6b520a2bc5937f19d4345ab /arch/ia64/configs/zx1_defconfig | |
| parent | 8f5140a6a0b1a9aa79585b0008e88c5d266c5c1d (diff) | |
| parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/ia64/configs/zx1_defconfig')
| -rw-r--r-- | arch/ia64/configs/zx1_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 0a06b1333c9..514f0635daf 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 |