summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2013-01-23 15:57:59 +0100
committerJason Cooper <jason@lakedaemon.net>2013-01-23 15:05:11 +0000
commitde27686b77f1c5c5dddf06d48fd322c52f098d51 (patch)
treea633d46322147722e438367505249554b599181e
parent830f8b9105b2d88cd2b115994e14bfe992f9a000 (diff)
downloadblackbird-op-linux-de27686b77f1c5c5dddf06d48fd322c52f098d51.tar.gz
blackbird-op-linux-de27686b77f1c5c5dddf06d48fd322c52f098d51.zip
arm: mvebu: i2c come back in defconfig
When the patch "arm: mvebu: Use dw-apb-uart instead of ns16650 as UART driver" was applied to a git tree and became the commit b24212fbfba25 it wrongly removed the i2c support. This patch reintroduce it. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/configs/mvebu_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index b5bc96cb65a7..cbd91bce1ca9 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -33,6 +33,8 @@ CONFIG_MVNETA=y
CONFIG_MARVELL_PHY=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_I2C=y
+CONFIG_I2C_MV64XXX=y
CONFIG_SERIAL_8250_DW=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
OpenPOWER on IntegriCloud