summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2013-07-08 14:59:04 -0500
committerJustin M. Forbes <jforbes@redhat.com>2013-07-08 14:59:04 -0500
commit692b701d08508db129e14bf11fa38effa1a96b85 (patch)
tree5532951dfd752d8bfb56b9b59ec7d915555b8394 /config-x86-generic
parent333a655d5447c1d66f091051f2024e6a18d2246a (diff)
downloadkernel-692b701d08508db129e14bf11fa38effa1a96b85.tar.gz
kernel-692b701d08508db129e14bf11fa38effa1a96b85.tar.xz
kernel-692b701d08508db129e14bf11fa38effa1a96b85.zip
Linux v3.10-6005-gd2b4a64
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic4
1 files changed, 2 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 42c0d09fe..be81bd74c 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -132,6 +132,7 @@ CONFIG_HOTPLUG_PCI_IBM=m
# CONFIG_HOTPLUG_PCI_CPCI is not set
CONFIG_PM=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_IPW2100=m
CONFIG_IPW2100_MONITOR=y
@@ -213,7 +214,6 @@ CONFIG_SAMSUNG_LAPTOP=m
CONFIG_SONY_LAPTOP=m
CONFIG_TOPSTAR_LAPTOP=m
-
CONFIG_ACPI_WMI=m
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -331,7 +331,7 @@ CONFIG_STRICT_DEVMEM=y
# CONFIG_MEMTEST is not set
# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_MAXSMP is not set
+CONFIG_MAXSMP=y
CONFIG_HP_ILO=m