aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorNAMIT JAIN <namit.jain@stericsson.com>2010-03-19 14:02:17 +0530
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:44:49 -0600
commita987cdc7e892d6e5bdb08f05ec45c7bc632562d0 (patch)
tree60270594a507ad9437fd9ffc6811f6a2ee4627ea /arch/arm/configs
parent8930d5ec97ee186854738888207867d1ccda528d (diff)
defconfig updated for new i2c driver macro
Signed-off-by: NAMIT JAIN <namit.jain@stericsson.com>
Diffstat (limited to 'arch/arm/configs')
-rwxr-xr-x[-rw-r--r--]arch/arm/configs/mop500_defconfig2
-rwxr-xr-x[-rw-r--r--]arch/arm/configs/mop500_ed_defconfig2
-rwxr-xr-x[-rw-r--r--]arch/arm/configs/sim5500_defconfig2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/mop500_defconfig b/arch/arm/configs/mop500_defconfig
index 799131cd2f5..77cc5a6fe35 100644..100755
--- a/arch/arm/configs/mop500_defconfig
+++ b/arch/arm/configs/mop500_defconfig
@@ -776,12 +776,12 @@ CONFIG_I2C_HELPER_AUTO=y
#
# I2C Hardware Bus support
#
-CONFIG_I2C_STM=y
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_NOMADIK=y
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_SIMTEC is not set
diff --git a/arch/arm/configs/mop500_ed_defconfig b/arch/arm/configs/mop500_ed_defconfig
index 43877c849f9..2065f10e541 100644..100755
--- a/arch/arm/configs/mop500_ed_defconfig
+++ b/arch/arm/configs/mop500_ed_defconfig
@@ -751,7 +751,7 @@ CONFIG_I2C_HELPER_AUTO=y
#
# I2C Hardware Bus support
#
-CONFIG_I2C_STM=y
+CONFIG_I2C_NOMADIK=y
#
# I2C system bus drivers (mostly embedded / system-on-chip)
diff --git a/arch/arm/configs/sim5500_defconfig b/arch/arm/configs/sim5500_defconfig
index 48ceee35133..c19b48ad65d 100644..100755
--- a/arch/arm/configs/sim5500_defconfig
+++ b/arch/arm/configs/sim5500_defconfig
@@ -642,7 +642,7 @@ CONFIG_I2C_HELPER_AUTO=y
#
# I2C Hardware Bus support
#
-CONFIG_I2C_STM=y
+CONFIG_I2C_NOMADIK=y
#
# I2C system bus drivers (mostly embedded / system-on-chip)