summaryrefslogtreecommitdiff
path: root/arch/arm/configs/mvebu_defconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-05 10:56:53 +0400
committerOlof Johansson <olof@lixom.net>2013-02-05 10:56:53 +0400
commit71e45bd2f9f30d7aa9f406f55aef98caa628d627 (patch)
tree67abd492f098f967047cae6e7e14b34af6456cc3 /arch/arm/configs/mvebu_defconfig
parent469da62096e23adc755c1268b00b5fc7a214151b (diff)
parent9cfc94eb0f4843af5d1141a37d7b7ca5d3b27220 (diff)
downloadlinux-71e45bd2f9f30d7aa9f406f55aef98caa628d627.tar.xz
Merge tag 'drivers_for_v3.9' of git://git.infradead.org/users/jcooper/linux into next/soc
From Jason Cooper: mvebu drivers for v3.9 - use rtc-mv in mvebu armv7 SoCs - add pci-e hotplug for kirkwood Depends on: - tags/mvebu_fixes_for_v3.8-rc6 * tag 'drivers_for_v3.9' of git://git.infradead.org/users/jcooper/linux: cpuidle: kirkwood: Move out of mach directory rtc: Add support of rtc-mv for MVEBU SoCs ARM: Kirkwood: Support basic hotplug for PCI-E arm: mvebu: i2c come back in defconfig arm: plat-orion: fix printing of "MPP config unavailable on this hardware" Dove: activate GPIO interrupts in DT
Diffstat (limited to 'arch/arm/configs/mvebu_defconfig')
-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