[kernel] r22568 - in dists/trunk/linux/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Sun May 10 02:12:22 2015
New Revision: 22568

Log:
[x86] Re-enable IOSF_MBI and INTEL_RAPL

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun May 10 02:10:02 2015	(r22567)
+++ dists/trunk/linux/debian/changelog	Sun May 10 02:12:22 2015	(r22568)
@@ -236,6 +236,7 @@
     drivers now depend on rather than selecting it (fixes FTBFS on i386)
   * HID: Enable HID_USB_WACOM, replacing HID_WACOM
   * [x86] thermal: Enable INT340X_THERMAL, replacing ACPI_INT3403_THERMAL
+  * [x86] Re-enable IOSF_MBI and INTEL_RAPL
 
   [ Ian Campbell ]
   * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Sun May 10 02:10:02 2015	(r22567)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sun May 10 02:12:22 2015	(r22568)
@@ -10,6 +10,7 @@
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_INTEL_LPSS=y
+CONFIG_IOSF_MBI=m
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y