diff options
author | Kyle McMartin <kyle@mcmartin.ca> | 2010-10-22 12:24:02 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-10-22 12:24:02 -0400 |
commit | c22cea221f8de78ab36ce0f183b73c99031cc7dc (patch) | |
tree | 03d0921c8157e6a2e2dd113cfb3be75ccd1a9aaa /config-x86_64-generic | |
parent | a791768570bae98c698d212d363f6c36ac5d42e5 (diff) | |
download | kernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.tar.gz kernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.tar.xz kernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.zip |
start following git head again
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r-- | config-x86_64-generic | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index 713c7ef17..069aaf56d 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -419,3 +419,7 @@ CONFIG_XEN_PLATFORM_PCI=m # CONFIG_ACPI_QUICKSTART is not set CONFIG_IDEAPAD_ACPI=m CONFIG_INTEL_IPS=m + +CONFIG_EDAC_MCE_INJ=m +CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_X86_RESERVE_LOW=64 |