diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
| commit | 3eacdf58c2c0b9507afedfc19108e98b992c31e4 (patch) | |
| tree | d95e7e022ff6e6181edce43fe97cf2883b5a91ed /arch/arm/configs/sx1_defconfig | |
| parent | dd0a251c8e087bca05e8f9a3657078591ae6e12b (diff) | |
| parent | 5376071069ec8a7e6a8112beab16fc24f5139475 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/arm/configs/sx1_defconfig')
| -rw-r--r-- | arch/arm/configs/sx1_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/sx1_defconfig b/arch/arm/configs/sx1_defconfig index 853dcdd9f2e0..25b007ff8bab 100644 --- a/arch/arm/configs/sx1_defconfig +++ b/arch/arm/configs/sx1_defconfig | |||
| @@ -610,7 +610,7 @@ CONFIG_I2C_OMAP=y | |||
| 610 | # | 610 | # |
| 611 | # CONFIG_SENSORS_DS1337 is not set | 611 | # CONFIG_SENSORS_DS1337 is not set |
| 612 | # CONFIG_SENSORS_DS1374 is not set | 612 | # CONFIG_SENSORS_DS1374 is not set |
| 613 | # CONFIG_SENSORS_EEPROM is not set | 613 | # CONFIG_EEPROM_LEGACY is not set |
| 614 | # CONFIG_SENSORS_PCF8574 is not set | 614 | # CONFIG_SENSORS_PCF8574 is not set |
| 615 | # CONFIG_SENSORS_PCA9539 is not set | 615 | # CONFIG_SENSORS_PCA9539 is not set |
| 616 | # CONFIG_SENSORS_PCF8591 is not set | 616 | # CONFIG_SENSORS_PCF8591 is not set |