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-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-generic')
| -rw-r--r-- | config-x86-generic | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic index 21f51cece..e4b66901e 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -154,6 +154,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 # # CPUFreq processor drivers @@ -374,6 +375,9 @@ CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_XENFS=m CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_BACKEND=y +CONFIG_XEN_DEBUG_FS=y +CONFIG_XEN_PLATFORM_PCI=m +CONFIG_XEN_GNTDEV=m CONFIG_MTD_ESB2ROM=m CONFIG_MTD_CK804XROM=m @@ -408,6 +412,8 @@ CONFIG_SENSORS_I5K_AMB=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set CONFIG_HP_WATCHDOG=m +CONFIG_NV_TCO=m +CONFIG_SP5100_TCO=m CONFIG_OLPC=y CONFIG_OLPC_OPENFIRMWARE=y @@ -445,7 +451,6 @@ CONFIG_X86_RESERVE_LOW_64K=y CONFIG_PANASONIC_LAPTOP=m -CONFIG_XEN_DEBUG_FS=y CONFIG_X86_PTRACE_BTS=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -509,7 +514,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 @@ -529,3 +533,14 @@ CONFIG_PCH_PHUB=m CONFIG_JUMP_LABEL=y CONFIG_X86_32_IRIS=m + +CONFIG_TRANSPARENT_HUGEPAGE=y + +CONFIG_CRYPTO_AES_NI_INTEL=m + +CONFIG_MTD_OF_PARTS=m +CONFIG_MTD_PHYSMAP_OF=m +CONFIG_PROC_DEVICETREE=y +CONFIG_SERIAL_OF_PLATFORM=m +CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m +CONFIG_MMC_SDHCI_OF=m |