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-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-generic')
| -rw-r--r-- | config-x86-generic | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic index ba3993563..616fae957 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -507,3 +507,8 @@ CONFIG_XEN_PLATFORM_PCI=m CONFIG_IDEAPAD_ACPI=m CONFIG_INTEL_IPS=m +CONFIG_OLPC_XO1=m + +CONFIG_EDAC_MCE_INJ=m +CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_X86_RESERVE_LOW=64 |