diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 11:14:38 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 11:14:38 -0400 |
| commit | b92efa9abffc4a634cd2e7a0f81f8aa6310d67c9 (patch) | |
| tree | 9847508d9b8d4e585f90db4a453bfbc3700c997e /arch/arm/configs/colibri_defconfig | |
| parent | a16fffdd8eb95ebab7dc22414896fe6493951e0e (diff) | |
| parent | be0ea69674ed95e1e98cb3687a241badc756d228 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch
Diffstat (limited to 'arch/arm/configs/colibri_defconfig')
| -rw-r--r-- | arch/arm/configs/colibri_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/colibri_defconfig b/arch/arm/configs/colibri_defconfig index c3e3418ed4fe..744086fff414 100644 --- a/arch/arm/configs/colibri_defconfig +++ b/arch/arm/configs/colibri_defconfig | |||
| @@ -801,7 +801,7 @@ CONFIG_I2C_CHARDEV=y | |||
| 801 | # CONFIG_SENSORS_DS1337 is not set | 801 | # CONFIG_SENSORS_DS1337 is not set |
| 802 | # CONFIG_SENSORS_DS1374 is not set | 802 | # CONFIG_SENSORS_DS1374 is not set |
| 803 | # CONFIG_DS1682 is not set | 803 | # CONFIG_DS1682 is not set |
| 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_PCA9539 is not set | 806 | # CONFIG_SENSORS_PCA9539 is not set |
| 807 | # CONFIG_SENSORS_PCF8591 is not set | 807 | # CONFIG_SENSORS_PCF8591 is not set |