Merge tag 'v3.20-next-defconfig' of https://github.com/mbgg/linux-mediatek into next...
authorOlof Johansson <olof@lixom.net>
Tue, 13 Jan 2015 23:13:08 +0000 (15:13 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Jan 2015 23:13:08 +0000 (15:13 -0800)
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

index bc393b7e5ece1f1f985d994e01312f8cf5814837..3ac2a62979dbe82c4e5cad7b702421b440ccf478 100644 (file)
@@ -195,6 +195,7 @@ CONFIG_SERIO_AMBAKMI=y
 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