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/sh/configs/cayman_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/sh/configs/cayman_defconfig')
| -rw-r--r-- | arch/sh/configs/cayman_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig index e21c0e8e22d9..92895013813d 100644 --- a/arch/sh/configs/cayman_defconfig +++ b/arch/sh/configs/cayman_defconfig | |||
| @@ -700,8 +700,8 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 700 | # Miscellaneous I2C Chip support | 700 | # Miscellaneous I2C Chip support |
| 701 | # | 701 | # |
| 702 | # CONFIG_DS1682 is not set | 702 | # CONFIG_DS1682 is not set |
| 703 | # CONFIG_AT24 is not set | 703 | # CONFIG_EEPROM_AT24 is not set |
| 704 | # CONFIG_SENSORS_EEPROM is not set | 704 | # CONFIG_EEPROM_LEGACY is not set |
| 705 | # CONFIG_SENSORS_PCF8574 is not set | 705 | # CONFIG_SENSORS_PCF8574 is not set |
| 706 | # CONFIG_PCF8575 is not set | 706 | # CONFIG_PCF8575 is not set |
| 707 | # CONFIG_SENSORS_PCA9539 is not set | 707 | # CONFIG_SENSORS_PCA9539 is not set |