diff options
author | 2015-06-19 01:17:35 +0200 | |
---|---|---|
committer | 2015-06-19 01:17:35 +0200 | |
commit | e193cd15ae98817ad82cc8bad61a200ac561e98c (patch) | |
tree | a4b645de8fe35f75e3d9459461bb89e8ffc41979 /drivers/acpi/Kconfig | |
parent | Merge branch 'acpi-video' (diff) | |
parent | ufs: fix TRUE and FALSE re-define build error (diff) | |
download | linux-e193cd15ae98817ad82cc8bad61a200ac561e98c.tar.gz linux-e193cd15ae98817ad82cc8bad61a200ac561e98c.tar.bz2 linux-e193cd15ae98817ad82cc8bad61a200ac561e98c.zip |
Merge branch 'acpi-cca'
* acpi-cca:
ufs: fix TRUE and FALSE re-define build error
megaraid_sas: fix TRUE and FALSE re-define build error
amd-xgbe: Unify coherency checking logic with device_dma_is_coherent()
crypto: ccp - Unify coherency checking logic with device_dma_is_coherent()
device property: Introduces device_dma_is_coherent()
arm64 : Introduce support for ACPI _CCA object
ACPI / scan: Parse _CCA and setup device coherency
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 16da18597def..35da507411a0 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -54,6 +54,9 @@ config ACPI_GENERIC_GSI config ACPI_SYSTEM_POWER_STATES_SUPPORT bool +config ACPI_CCA_REQUIRED + bool + config ACPI_SLEEP bool depends on SUSPEND || HIBERNATION |