From 9d9c7a052584a81a40d515b30373b8cba7ceed57 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 20 Jul 2013 21:23:45 +0000 Subject: [PATCH] [x86] Change INTEL_MEI_ME back to a module (Closes: #717383) svn path=/dists/sid/linux/; revision=20395 --- debian/changelog | 1 + debian/config/kernelarch-x86/config | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b1bb24d56..c6fa486b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ linux (3.10.1-2) UNRELEASED; urgency=low * be2net: Fix to avoid hardware workaround when not needed * iwlwifi: Update 3160 and 7260 support to work with production firmware * rtlwifi: rtl8723ae: Fix typo in firmware names + * [x86] Change INTEL_MEI_ME back to a module (Closes: #717383) -- Arnaud Patard Tue, 16 Jul 2013 08:19:29 +0200 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 1e9b2a7b2..c596ec068 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -738,7 +738,7 @@ CONFIG_PCH_PHUB=m ## file: drivers/misc/mei/Kconfig ## CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI_ME=m ## ## file: drivers/misc/vmw_vmci/Kconfig