summaryrefslogtreecommitdiff
path: root/arch/mips/configs/ath79_defconfig
diff options
context:
space:
mode:
authorJason Gunthorpe <jgg@mellanox.com>2019-02-05 00:53:42 +0300
committerJason Gunthorpe <jgg@mellanox.com>2019-02-05 00:53:42 +0300
commit6a8a2aa62da2fbe51f5449993fd366398048f465 (patch)
tree566c6fcc782eefbca054af8553371d09b9d0734c /arch/mips/configs/ath79_defconfig
parenta163afc88556e099271a7b423295bc5176fcecce (diff)
parent8834f5600cf3c8db365e18a3d5cac2c2780c81e5 (diff)
downloadlinux-6a8a2aa62da2fbe51f5449993fd366398048f465.tar.xz
Merge tag 'v5.0-rc5' into rdma.git for-next
Linux 5.0-rc5 Needed to merge the include/uapi changes so we have an up to date single-tree for these files. Patches already posted are also expected to need this for dependencies.
Diffstat (limited to 'arch/mips/configs/ath79_defconfig')
-rw-r--r--arch/mips/configs/ath79_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/configs/ath79_defconfig b/arch/mips/configs/ath79_defconfig
index 4e4ec779f182..6f981af67826 100644
--- a/arch/mips/configs/ath79_defconfig
+++ b/arch/mips/configs/ath79_defconfig
@@ -66,6 +66,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
# CONFIG_SERIAL_8250_PCI is not set
CONFIG_SERIAL_8250_NR_UARTS=1
CONFIG_SERIAL_8250_RUNTIME_UARTS=1
+CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_AR933X=y
CONFIG_SERIAL_AR933X_CONSOLE=y
# CONFIG_HW_RANDOM is not set