diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-30 19:02:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-30 19:02:07 -0700 |
| commit | c004546a667b0aeda813e4855ce052c04293b7c9 (patch) | |
| tree | e4f10eef71e01a4bf65f478cc6340cc5b7e84c2c /arch/arm | |
| parent | a78771e744d12ec675c0982134b8513b0280ab1f (diff) | |
| parent | 7c9730c5684d8ffd69ee0b9e1739484cc6a35b23 (diff) | |
Merge branch 'next/defconfig' into for-next
* next/defconfig:
ARM: multi_v7_defconfig: enable UniPhier I2C drivers
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
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 |