summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic13
1 files changed, 13 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 3b10fb84b..e920346f5 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -34,6 +34,7 @@ CONFIG_X86_PAT=y
CONFIG_X86_PM_TIMER=y
CONFIG_EFI=y
+# CONFIG_EFI_STUB is not set
CONFIG_EFI_VARS=y
CONFIG_EFI_PCDP=y
CONFIG_FB_EFI=y
@@ -113,6 +114,7 @@ CONFIG_PM_STD_PARTITION=""
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_BIOS=y
+CONFIG_PCI_IOAPIC=y
CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -216,6 +218,7 @@ CONFIG_XO15_EBOOK=m
# CONFIG_SMSC37B787_WDT is not set
CONFIG_W83697HF_WDT=m
+CONFIG_VIA_WDT=m
CONFIG_CRASH_DUMP=y
CONFIG_PROC_VMCORE=y
@@ -375,6 +378,7 @@ CONFIG_PCH_PHUB=m
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
CONFIG_HP_ACCEL=m
@@ -389,3 +393,12 @@ CONFIG_RELOCATABLE=y
# CONFIG_HYPERV is not set
+# Depends on HOTPLUG_PCI_PCIE
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+
+# Figure out how this relates to DRM_PSB in staging because confused
+# CONFIG_DRM_GMA500 is not set
+
+# Maybe enable in debug kernels?
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+