diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-13 18:13:08 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-13 18:13:08 -0500 |
| commit | 15e89691a41de6b415ea1e8e24372f0de572827c (patch) | |
| tree | e964c26865e2ac13edf6a86d46d663b3f649ff59 /arch/arm | |
| parent | f58350eb01ab6b342e9299bfec98f659e54f0cca (diff) | |
| parent | 7bae74f04d03f81c40c8b614e94b15975dd25ff6 (diff) | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index bc393b7e5ece..3ac2a62979db 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
| @@ -195,6 +195,7 @@ CONFIG_SERIO_AMBAKMI=y | |||
| 195 | CONFIG_SERIAL_8250=y | 195 | CONFIG_SERIAL_8250=y |
| 196 | CONFIG_SERIAL_8250_CONSOLE=y | 196 | CONFIG_SERIAL_8250_CONSOLE=y |
| 197 | CONFIG_SERIAL_8250_DW=y | 197 | CONFIG_SERIAL_8250_DW=y |
| 198 | CONFIG_SERIAL_8250_MT6577=y | ||
| 198 | CONFIG_SERIAL_AMBA_PL011=y | 199 | CONFIG_SERIAL_AMBA_PL011=y |
| 199 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 200 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
| 200 | CONFIG_SERIAL_MESON=y | 201 | CONFIG_SERIAL_MESON=y |