diff --git a/debian/changelog b/debian/changelog index e22e02d69..193dc6132 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,7 +28,7 @@ linux-2.6 (2.6.31~rc5-1~experimental.1) UNRELEASED; urgency=low * [x86_64] Enable HW_RANDOM_VIA. * [x86] Keep divers staging stuff enabled. * [x86] Enable RT3070, COMEDI_PCMCIA_DRIVERS, ACERHDF, EDAC_AMD64, - XEN_DEV_EVTCHN, XEN_SYS_HYPERVISOR, + XEN_DEV_EVTCHN, XEN_SYS_HYPERVISOR, PERF_COUNTERS, CC_STACKPROTECTOR, DEFAULT_MMAP_MIN_ADDR=65536. * rtl8192su: remove firmware and disable. * Newer Standards-Version 3.8.2 without changes. diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 4f9f2bed2..56de09b35 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -419,6 +419,11 @@ CONFIG_XENFS=m CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_SYS_HYPERVISOR=y +## +## file: init/Kconfig +## +CONFIG_PERF_COUNTERS=y + ## ## file: mm/Kconfig ##