diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-05-21 22:17:04 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-05-21 22:17:04 -0400 |
| commit | da90872924556bce070132e353b653e3ce88aa1a (patch) | |
| tree | fcfdad8d4e04bbdddd2e3ebcba85bfbb14cbf8d8 /config-x86-generic | |
| parent | 3dd0fcf0aa26baa4e8e02c7cd298616128c4b980 (diff) | |
| download | kernel-da90872924556bce070132e353b653e3ce88aa1a.tar.gz kernel-da90872924556bce070132e353b653e3ce88aa1a.tar.xz kernel-da90872924556bce070132e353b653e3ce88aa1a.zip | |
Update configs for first 3.5 merge window git snapshot
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic index ad2ae8ecd..3b5f51b56 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -91,6 +91,7 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y # CONFIG_ACPI_APEI_EINJ is not set CONFIG_ACPI_IPMI=m CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=m CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_PCC_CPUFREQ=y @@ -253,6 +254,7 @@ CONFIG_XEN_BALLOON=y CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_SAVE_RESTORE=y CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y CONFIG_XEN_FBDEV_FRONTEND=y CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_NETDEV_FRONTEND=m @@ -270,6 +272,7 @@ CONFIG_XEN_GNTDEV=m CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m CONFIG_XEN_SELFBALLOONING=y CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_ACPI_PROCESSOR=m CONFIG_MTD_ESB2ROM=m CONFIG_MTD_CK804XROM=m |