diff options
author | David S. Miller <davem@davemloft.net> | 2009-01-27 02:43:16 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-27 02:43:16 +0100 |
commit | 3eacdf58c2c0b9507afedfc19108e98b992c31e4 (patch) | |
tree | d95e7e022ff6e6181edce43fe97cf2883b5a91ed /arch/arm/configs/iop32x_defconfig | |
parent | com0020: Add missing symbol export for com20020_netdev_ops. (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
download | linux-3eacdf58c2c0b9507afedfc19108e98b992c31e4.tar.xz linux-3eacdf58c2c0b9507afedfc19108e98b992c31e4.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/arm/configs/iop32x_defconfig')
-rw-r--r-- | arch/arm/configs/iop32x_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig index 8612f58e1056..d70177b38f5f 100644 --- a/arch/arm/configs/iop32x_defconfig +++ b/arch/arm/configs/iop32x_defconfig @@ -847,7 +847,7 @@ CONFIG_I2C_IOP3XX=y # 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 |