aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-10-27 11:47:13 +0900
committerOlof Johansson <olof@lixom.net>2015-10-31 01:56:18 +0000
commit7c9730c5684d8ffd69ee0b9e1739484cc6a35b23 (patch)
tree8709c7212ad8ff101ea209c7268671df4509680f
parent3af37f0228232d1ad1963c559aaa86dc48a8cfc2 (diff)
downloadlinux-linaro-stable-7c9730c5684d8ffd69ee0b9e1739484cc6a35b23.tar.gz
ARM: multi_v7_defconfig: enable UniPhier I2C drivers
These two drivers were merged into the I2C sub-system by commit dd6fd4a32793 ("i2c: uniphier: add UniPhier FIFO-less I2C driver") and commit 6a62974b667f ("i2c: uniphier_f: add UniPhier FIFO-builtin I2C driver"). Enable them from arch/arm/configs/multi_v7_defconfig. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/configs/multi_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 087b6a3e8a76..69a22fdb52a5 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -315,6 +315,8 @@ CONFIG_I2C_SIRF=y
CONFIG_I2C_ST=y
CONFIG_I2C_SUN6I_P2WI=y
CONFIG_I2C_TEGRA=y
+CONFIG_I2C_UNIPHIER=y
+CONFIG_I2C_UNIPHIER_F=y
CONFIG_I2C_XILINX=y
CONFIG_I2C_RCAR=y
CONFIG_I2C_CROS_EC_TUNNEL=m