summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/magician_defconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-23 08:17:28 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-23 08:17:28 +0100
commit66a101dda6b26ee566aa9cadcbea904a41d2b268 (patch)
treee03b5d40b7b88bb0a2f432bceba4680086d6d3a1 /arch/arm/configs/magician_defconfig
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff)
parent28b7e343ee63454d563a71d2d5f769fc297fd5ad (diff)
downloadtalos-op-linux-66a101dda6b26ee566aa9cadcbea904a41d2b268.tar.gz
talos-op-linux-66a101dda6b26ee566aa9cadcbea904a41d2b268.zip
Merge branch 'topic/hwdep-cleanup' into topic/hdsp
Diffstat (limited to 'arch/arm/configs/magician_defconfig')
-rw-r--r--arch/arm/configs/magician_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig
index 4d11678584db..73ba62b71063 100644
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
@@ -678,7 +678,7 @@ CONFIG_I2C_PXA=m
# CONFIG_SENSORS_DS1337 is not set
# CONFIG_SENSORS_DS1374 is not set
# CONFIG_DS1682 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set
OpenPOWER on IntegriCloud