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/arm/configs/neponset_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/arm/configs/neponset_defconfig')
| -rw-r--r-- | arch/arm/configs/neponset_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponset_defconfig index 92ccdc6492f7..d81ea219c934 100644 --- a/arch/arm/configs/neponset_defconfig +++ b/arch/arm/configs/neponset_defconfig | |||
| @@ -737,7 +737,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 737 | # | 737 | # |
| 738 | # Other I2C Chip support | 738 | # Other I2C Chip support |
| 739 | # | 739 | # |
| 740 | # CONFIG_SENSORS_EEPROM is not set | 740 | # CONFIG_EEPROM_LEGACY is not set |
| 741 | # CONFIG_SENSORS_PCF8574 is not set | 741 | # CONFIG_SENSORS_PCF8574 is not set |
| 742 | # CONFIG_SENSORS_PCF8591 is not set | 742 | # CONFIG_SENSORS_PCF8591 is not set |
| 743 | # CONFIG_SENSORS_RTC8564 is not set | 743 | # CONFIG_SENSORS_RTC8564 is not set |