summaryrefslogtreecommitdiffstats
path: root/config-x86_64-generic
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-03-28 15:15:32 -0400
committerKyle McMartin <kyle@redhat.com>2011-03-28 17:22:32 -0400
commitdb49e9edd88a3f41e7c5f249c26583c579a41bb1 (patch)
tree8aa40ec5918044c135000a68524ddee9da2172a3 /config-x86_64-generic
parent561c61e4ca69b9f215c5f476aea5e78928fe4af1 (diff)
downloadkernel-db49e9edd88a3f41e7c5f249c26583c579a41bb1.tar.gz
kernel-db49e9edd88a3f41e7c5f249c26583c579a41bb1.tar.xz
kernel-db49e9edd88a3f41e7c5f249c26583c579a41bb1.zip
update to snapshot 2.6.38-git19
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r--config-x86_64-generic3
1 files changed, 3 insertions, 0 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 021572013..11464ebba 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -98,6 +98,7 @@ CONFIG_ACPI_POWER_METER=m
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_HED=m
CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_ACPI_APEI_GHES=m
# CONFIG_ACPI_APEI_EINJ is not set
CONFIG_ACPI_IPMI=m
@@ -458,3 +459,5 @@ CONFIG_HP_ILO=m
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_HP_ACCEL=m
+
+# CONFIG_RAPIDIO is not set