diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:52:05 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:52:05 -0500 |
| commit | eae11717a184705aad08a3783cba964bfa3a06dd (patch) | |
| tree | 1eea57a2c772ec5b31389a2ef568056b48b4c75e /config-x86_64-generic | |
| parent | 72b3729657a0c46f187e4a6c500b239a0e4d391a (diff) | |
| parent | cbb00197b664276f98b22d0531c342231d4d6ae0 (diff) | |
| download | kernel-eae11717a184705aad08a3783cba964bfa3a06dd.tar.gz kernel-eae11717a184705aad08a3783cba964bfa3a06dd.tar.xz kernel-eae11717a184705aad08a3783cba964bfa3a06dd.zip | |
Merge branch 'kernel-git'
Diffstat (limited to 'config-x86_64-generic')
| -rw-r--r-- | config-x86_64-generic | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index b2e4a2531..b09e5112c 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -15,7 +15,7 @@ CONFIG_NUMA=y CONFIG_K8_NUMA=y CONFIG_X86_64_ACPI_NUMA=y # CONFIG_NUMA_EMU is not set -CONFIG_NR_CPUS=256 +CONFIG_NR_CPUS=512 CONFIG_X86_POWERNOW_K8=m CONFIG_X86_P4_CLOCKMOD=m CONFIG_IA32_EMULATION=y @@ -204,6 +204,9 @@ CONFIG_EDAC_AMD64=m # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I7300=m +CONFIG_EDAC_X38=m CONFIG_SCHED_MC=y @@ -284,6 +287,7 @@ CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_SPINLOCKS is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y +CONFIG_KVM_MMU_AUDIT=y CONFIG_XEN=y CONFIG_XEN_MAX_DOMAIN_MEMORY=32 @@ -295,6 +299,7 @@ CONFIG_XEN_FBDEV_FRONTEND=y CONFIG_XEN_KBDDEV_FRONTEND=y CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_XENFS=m CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_DEV_EVTCHN=m @@ -419,5 +424,18 @@ CONFIG_XEN_PLATFORM_PCI=m # CONFIG_ACPI_QUICKSTART is not set CONFIG_IDEAPAD_ACPI=m CONFIG_INTEL_IPS=m +CONFIG_IDEAPAD_LAPTOP=m +# CONFIG_IBM_RTL is not set + +CONFIG_EDAC_MCE_INJ=m +CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_X86_RESERVE_LOW=64 + +CONFIG_PCH_GBE=m +CONFIG_PCH_PHUB=m + +CONFIG_VIDEO_VIA_CAMERA=m + +CONFIG_JUMP_LABEL=y CONFIG_HP_ILO=m |