aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--debian/config/config6
2 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6ac36c30d47c..784b258c09ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linux (4.17.14-2) UNRELEASED; urgency=medium
+
+ * serdev: Enable SERIAL_DEV_BUS, SERIAL_DEV_CTRL_TTYPORT as built-in
+ (except on armel)
+ - bluetooth: Re-enable BT_HCIUART_{BCM,LL} (Closes: #906048)
+
+ -- Ben Hutchings <ben@decadent.org.uk> Tue, 14 Aug 2018 00:07:30 +0800
+
linux (4.17.14-1) unstable; urgency=high
* New upstream stable update:
diff --git a/debian/config/config b/debian/config/config
index 4fc48262ac59..925cd629c57b 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4781,6 +4781,12 @@ CONFIG_HVC_XEN=y
CONFIG_HVC_XEN_FRONTEND=y
##
+## file: drivers/tty/serdev/Kconfig
+##
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+
+##
## file: drivers/tty/serial/Kconfig
##
# CONFIG_SERIAL_MAX3100 is not set