commit 15e89691a41de6b415ea1e8e24372f0de572827c
author Olof Johansson <olof@lixom.net> Tue Jan 13 15:13:08 2015 -0800
committer Olof Johansson <olof@lixom.net> Tue Jan 13 15:13:08 2015 -0800
tree e964c26865e2ac13edf6a86d46d663b3f649ff59
parent f58350eb01ab6b342e9299bfec98f659e54f0cca
parent 7bae74f04d03f81c40c8b614e94b15975dd25ff6

Merge tag 'v3.20-next-defconfig' of https://github.com/mbgg/linux-mediatek into next/defconfig

Merge "ARM: mediatek: defconfig changes for v3.20" from Matthias Brugger:

Add mediatek uart to multi_v7_defconfig

* tag 'v3.20-next-defconfig' of https://github.com/mbgg/linux-mediatek:
  ARM: Add mediatek SoC UART support in defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/configs/multi_v7_defconfig

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index bc393b7e..3ac2a62 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -195,6 +195,7 @@
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_8250_MT6577=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_MESON=y