diff options
| author | Masahiro Yamada | 2015-07-10 06:53:58 +0200 |
|---|---|---|
| committer | Olof Johansson | 2015-07-14 11:21:54 +0200 |
| commit | 91e2213bdb23e7ca863fba53c82fcd094aeddd24 (patch) | |
| tree | 4d5e4c6de0d670d3427269fc5737bece0caf7a07 /arch/arm/configs/multi_v7_defconfig | |
| parent | ARM: multi_v7_defconfig: enable Conexant Digicolor watchdog (diff) | |
| download | kernel-qcow2-linux-91e2213bdb23e7ca863fba53c82fcd094aeddd24.tar.gz kernel-qcow2-linux-91e2213bdb23e7ca863fba53c82fcd094aeddd24.tar.xz kernel-qcow2-linux-91e2213bdb23e7ca863fba53c82fcd094aeddd24.zip | |
ARM: multi_v7_defconfig: enable UniPhier UART driver
The UniPhier on-chip UART driver was merged into the mainline by
commit 1a8d2903cb6a ("serial: 8250_uniphier: add UniPhier serial
driver").
Enable it from multi_v7_defconfig.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -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 595acd693fa8..6d7b36608853 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -251,6 +251,7 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EM=y CONFIG_SERIAL_8250_MT6577=y +CONFIG_SERIAL_8250_UNIPHIER=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_ATMEL=y |