[linux] 01/03: Change RXKAD and SERIAL_8250_FINTEK from =m to =y

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 68902cad173d98402fcd619c25bdd154cb353c15
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Aug 28 02:01:53 2016 +0100

    Change RXKAD and SERIAL_8250_FINTEK from =m to =y
    
    They are now options for other drivers.
---
 debian/changelog                    | 4 +++-
 debian/config/config                | 2 +-
 debian/config/kernelarch-x86/config | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88e77fc..2b0ff47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,10 +13,12 @@ linux (4.7.2-1) UNRELEASED; urgency=medium
 
   [ Ben Hutchings ]
   * sched: Enable SCHEDSTATS (Closes: #796674)
-  * Re-enable various config options disabled by name changes in 4.7:
+  * Re-enable various config options disabled by name and type changes in 4.7:
     - nfc: NFC_PN533_USB replaced NFC_PN533
     - [armhf] dsa: NET_DSA_MV88E6XXX replaced NET_DSA_MV88E6{123,131,171}
     - [x86] ACPI: ACPI_TABLE_UPGRADE replaced ACPI_INITRD_TABLE_OVERRIDE
+    - rxrpc: Enable RXKAD as part of af_rxrpc module
+    - [x86] 8250: Enable SERIAL_8250_FINTEK as built-in
   * cgroups: Enable memory controller by default
   * [armfh] udeb: Add efi-modules
   * linux-kbuild: Include headers_install.sh and unifdef (Closes: #832359)
diff --git a/debian/config/config b/debian/config/config
index 1d46ebd..f01cd7e 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -6501,7 +6501,7 @@ CONFIG_RFKILL_INPUT=y
 ##
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
+CONFIG_RXKAD=y
 
 ##
 ## file: net/sched/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 5e5d8c1..ac68c6b 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1671,7 +1671,7 @@ CONFIG_SERIAL_JSM=m
 ## file: drivers/tty/serial/8250/Kconfig
 ##
 CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_FINTEK=m
+CONFIG_SERIAL_8250_FINTEK=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git