diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-01-15 00:56:55 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-01-15 00:56:55 -0500 |
| commit | ee6c061eb9517d21067cab44eeadec08b91cbd7a (patch) | |
| tree | 02af23e3a8c2dce8ce040aae37256cd68670073a /config-x86_64-generic | |
| parent | 685274a50860d0697240cf300ad417163be649cc (diff) | |
| download | kernel-ee6c061eb9517d21067cab44eeadec08b91cbd7a.tar.gz kernel-ee6c061eb9517d21067cab44eeadec08b91cbd7a.tar.xz kernel-ee6c061eb9517d21067cab44eeadec08b91cbd7a.zip | |
snapshot 2.6.37-git12
Diffstat (limited to 'config-x86_64-generic')
| -rw-r--r-- | config-x86_64-generic | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index 5ac06ca2b..39fdd3d54 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -98,6 +98,7 @@ CONFIG_ACPI_HED=m CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=m # CONFIG_ACPI_APEI_EINJ is not set +CONFIG_ACPI_IPMI=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ASUS_LAPTOP=m @@ -155,8 +156,8 @@ CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_CRYPTO_AES_X86_64=m -CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_AES_X86_64=y +CONFIG_CRYPTO_AES_NI_INTEL=y CONFIG_CRYPTO_TWOFISH_X86_64=m CONFIG_CRYPTO_SALSA20_X86_64=m @@ -306,6 +307,9 @@ CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_XEN_BACKEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_DEBUG_FS=y +CONFIG_XEN_PLATFORM_PCI=m CONFIG_DMADEVICES=y CONFIG_INTEL_IOATDMA=m @@ -318,6 +322,8 @@ CONFIG_PROVIDE_OHCI1394_DMA_INIT=y # CONFIG_CPA_DEBUG is not set CONFIG_HP_WATCHDOG=m +CONFIG_NV_TCO=m +CONFIG_SP5100_TCO=m CONFIG_FRAME_WARN=2048 @@ -357,7 +363,6 @@ CONFIG_X86_RESERVE_LOW_64K=y CONFIG_PANASONIC_LAPTOP=m -CONFIG_XEN_DEBUG_FS=y CONFIG_X86_PTRACE_BTS=y CONFIG_I7300_IDLE=m @@ -422,7 +427,6 @@ CONFIG_HPWDT_NMI_DECODING=y # CONFIG_MFD_TPS6586X is not set # CONFIG_INTEL_MID_DMAC is not set CONFIG_PCH_DMA=m -CONFIG_XEN_PLATFORM_PCI=m # CONFIG_ACPI_QUICKSTART is not set CONFIG_IDEAPAD_ACPI=m CONFIG_INTEL_IPS=m @@ -441,3 +445,5 @@ CONFIG_VIDEO_VIA_CAMERA=m CONFIG_JUMP_LABEL=y CONFIG_HP_ILO=m + +CONFIG_TRANSPARENT_HUGEPAGE=y |