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/arm/configs/cm_x300_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/arm/configs/cm_x300_defconfig')
| -rw-r--r-- | arch/arm/configs/cm_x300_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig index 46f1c9dc350c..227da0843ead 100644 --- a/arch/arm/configs/cm_x300_defconfig +++ b/arch/arm/configs/cm_x300_defconfig | |||
| @@ -763,8 +763,8 @@ CONFIG_I2C_PXA=y | |||
| 763 | # Miscellaneous I2C Chip support | 763 | # Miscellaneous I2C Chip support |
| 764 | # | 764 | # |
| 765 | # CONFIG_DS1682 is not set | 765 | # CONFIG_DS1682 is not set |
| 766 | # CONFIG_AT24 is not set | 766 | # CONFIG_EEPROM_AT24 is not set |
| 767 | # CONFIG_SENSORS_EEPROM is not set | 767 | # CONFIG_EEPROM_LEGACY is not set |
| 768 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
| 769 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
| 770 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |