diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
| commit | abcea2c322cef559ef2f108b4763d107a5ccc37f (patch) | |
| tree | 5fec7fec372f9bdb70703f6c77bfc49cda945442 /arch/sparc/configs/sparc64_defconfig | |
| parent | 8118aea23c328fd4913b325af53fda9d530b1d56 (diff) | |
| parent | 6d831c6554e4f95083919914955a1a3a4a6acfa9 (diff) | |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
Diffstat (limited to 'arch/sparc/configs/sparc64_defconfig')
| -rw-r--r-- | arch/sparc/configs/sparc64_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig index cde19ae78f5a..ade49941def2 100644 --- a/arch/sparc/configs/sparc64_defconfig +++ b/arch/sparc/configs/sparc64_defconfig | |||
| @@ -867,8 +867,8 @@ CONFIG_I2C_ALGOBIT=y | |||
| 867 | # Miscellaneous I2C Chip support | 867 | # Miscellaneous I2C Chip support |
| 868 | # | 868 | # |
| 869 | # CONFIG_DS1682 is not set | 869 | # CONFIG_DS1682 is not set |
| 870 | # CONFIG_AT24 is not set | 870 | # CONFIG_EEPROM_AT24 is not set |
| 871 | # CONFIG_SENSORS_EEPROM is not set | 871 | # CONFIG_EEPROM_LEGACY is not set |
| 872 | # CONFIG_SENSORS_PCF8574 is not set | 872 | # CONFIG_SENSORS_PCF8574 is not set |
| 873 | # CONFIG_PCF8575 is not set | 873 | # CONFIG_PCF8575 is not set |
| 874 | # CONFIG_SENSORS_PCA9539 is not set | 874 | # CONFIG_SENSORS_PCA9539 is not set |