[x86] Change INTEL_MEI_ME back to a module (Closes: #717383)

svn path=/dists/sid/linux/; revision=20395
This commit is contained in:
Ben Hutchings 2013-07-20 21:23:45 +00:00
parent 6598fbc0fb
commit 9d9c7a0525
2 changed files with 2 additions and 1 deletions

1
debian/changelog vendored
View File

@ -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 <arnaud.patard@rtp-net.org> Tue, 16 Jul 2013 08:19:29 +0200

View File

@ -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