diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-05-30 10:25:28 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-05-30 10:25:28 -0400 |
| commit | 6ddada4248b7f654b0e0fc765d194c707cd459a8 (patch) | |
| tree | ebfe041a244b7e8c38a821fbed1fe8fce0862e37 /config-x86-generic | |
| parent | 6fbe73c2bd2259d8773e374973ccdf7654b96f55 (diff) | |
| download | kernel-6ddada4248b7f654b0e0fc765d194c707cd459a8.tar.gz kernel-6ddada4248b7f654b0e0fc765d194c707cd459a8.tar.xz kernel-6ddada4248b7f654b0e0fc765d194c707cd459a8.zip | |
first pass of new config options in 3.0-rc1
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic index f8ccad801..7d6b72ba5 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -156,6 +156,7 @@ CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_GHES=m # CONFIG_ACPI_APEI_EINJ is not set CONFIG_ACPI_IPMI=m +CONFIG_ACPI_CUSTOM_METHOD=m # # CPUFreq processor drivers @@ -329,6 +330,7 @@ CONFIG_DELL_WMI_AIO=m CONFIG_ASUS_WMI=m CONFIG_ASUS_NB_WMI=m CONFIG_XO15_EBOOK=m +CONFIG_INTEL_OAKTRAIL=m # CONFIG_TOUCHSCREEN_INTEL_MID is not set @@ -384,6 +386,7 @@ CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_XENFS=m CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_BACKEND=y +CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_XEN_DEBUG_FS=y CONFIG_XEN_PLATFORM_PCI=m CONFIG_XEN_GNTDEV=m @@ -419,6 +422,8 @@ CONFIG_DMADEVICES=y CONFIG_INTEL_IOATDMA=m CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ACPI_POWER=m # CONFIG_CPA_DEBUG is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set |