[x86] Re-enable IOSF_MBI and INTEL_RAPL

svn path=/dists/trunk/linux/; revision=22568
This commit is contained in:
Ben Hutchings 2015-05-10 02:12:22 +00:00
parent a8be41082a
commit 2694c583f5
2 changed files with 2 additions and 0 deletions

1
debian/changelog vendored
View File

@ -236,6 +236,7 @@ linux (4.0.2-1~exp1) UNRELEASED; urgency=medium
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)

View File

@ -10,6 +10,7 @@ CONFIG_ZONE_DMA=y
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