diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
| commit | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch) | |
| tree | 0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /arch/arm/configs/footbridge_defconfig | |
| parent | 0d688da5505d77bcef2441e0a22d8cc26459702d (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/arm/configs/footbridge_defconfig')
| -rw-r--r-- | arch/arm/configs/footbridge_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/footbridge_defconfig b/arch/arm/configs/footbridge_defconfig index 299dc22294a0..6ace512fa101 100644 --- a/arch/arm/configs/footbridge_defconfig +++ b/arch/arm/configs/footbridge_defconfig | |||
| @@ -801,7 +801,7 @@ CONFIG_I2C=m | |||
| 801 | # | 801 | # |
| 802 | # Other I2C Chip support | 802 | # Other I2C Chip support |
| 803 | # | 803 | # |
| 804 | # CONFIG_SENSORS_EEPROM is not set | 804 | # CONFIG_EEPROM_LEGACY is not set |
| 805 | # CONFIG_SENSORS_PCF8574 is not set | 805 | # CONFIG_SENSORS_PCF8574 is not set |
| 806 | # CONFIG_SENSORS_PCF8591 is not set | 806 | # CONFIG_SENSORS_PCF8591 is not set |
| 807 | # CONFIG_SENSORS_RTC8564 is not set | 807 | # CONFIG_SENSORS_RTC8564 is not set |