diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-07-27 16:57:48 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-07-27 21:07:17 -0400 |
| commit | 35ffdcd40ec0fe800421cd251f16a85be845c0e7 (patch) | |
| tree | 99b8252ba790f60a326b34c622d73ae8d3413a22 /config-x86-generic | |
| parent | 4a2041744e262bb41936adfb3db0b85e13c73b11 (diff) | |
| download | kernel-35ffdcd40ec0fe800421cd251f16a85be845c0e7.tar.gz kernel-35ffdcd40ec0fe800421cd251f16a85be845c0e7.tar.xz kernel-35ffdcd40ec0fe800421cd251f16a85be845c0e7.zip | |
3.0-git9 snapshot
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/config-x86-generic b/config-x86-generic index f41bb9095..a4d47df80 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -341,6 +341,7 @@ CONFIG_LGUEST=m CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_TIME_ACCOUNTING=y # CONFIG_PARAVIRT_DEBUG is not set # PARAVIRT_SPINLOCKS has a 5% perf hit @@ -421,7 +422,10 @@ CONFIG_OLPC=y CONFIG_OLPC_OPENFIRMWARE=y CONFIG_BATTERY_OLPC=y CONFIG_MOUSE_PS2_OLPC=y - +CONFIG_OLPC_XO1_PM=y +CONFIG_OLPC_XO15_SCI=y +CONFIG_OLPC_XO1_RTC=y +CONFIG_OLPC_XO1_SCI=y # staging # CONFIG_FB_OLPC_DCON is not set @@ -536,8 +540,6 @@ CONFIG_X86_RESERVE_LOW=64 CONFIG_PCH_GBE=m CONFIG_PCH_PHUB=m -CONFIG_JUMP_LABEL=y - CONFIG_X86_32_IRIS=m CONFIG_TRANSPARENT_HUGEPAGE=y |