diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-23 08:17:28 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-23 08:17:28 +0100 |
commit | 66a101dda6b26ee566aa9cadcbea904a41d2b268 (patch) | |
tree | e03b5d40b7b88bb0a2f432bceba4680086d6d3a1 /arch/sh/configs/cayman_defconfig | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
parent | 28b7e343ee63454d563a71d2d5f769fc297fd5ad (diff) |
Merge branch 'topic/hwdep-cleanup' into topic/hdsp
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 e21c0e8e22d..92895013813 100644 --- a/arch/sh/configs/cayman_defconfig +++ b/arch/sh/configs/cayman_defconfig @@ -700,8 +700,8 @@ CONFIG_I2C_HELPER_AUTO=y # Miscellaneous I2C Chip support # # CONFIG_DS1682 is not set -# CONFIG_AT24 is not set -# CONFIG_SENSORS_EEPROM is not set +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_LEGACY is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_PCF8575 is not set # CONFIG_SENSORS_PCA9539 is not set |