From ee6c061eb9517d21067cab44eeadec08b91cbd7a Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@redhat.com>
Date: Sat, 15 Jan 2011 00:56:55 -0500
Subject: snapshot 2.6.37-git12

---
 config-x86-generic | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'config-x86-generic')

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
-- 
cgit